HDFS-16411 RBF: RouterId is NULL when set dfs.federation.router.rpc.enable=false; checkstyle

Author: yulongz

hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/Router.java

@@ -312,16 +312,16 @@ protected void serviceInit(Configuration configuration) throws Exception {
 
   /**
    * Set the router id if not set to prevent RouterHeartbeatService
-   * update state store with a null router id
+   * update state store with a null router id.
    */
   private void checkRouterId() {
     if (this.routerId == null) {
-      InetSocketAddress rpcAddress = conf.getSocketAddr(
+      InetSocketAddress ConfRpcAddress = conf.getSocketAddr(
           RBFConfigKeys.DFS_ROUTER_RPC_BIND_HOST_KEY,
           RBFConfigKeys.DFS_ROUTER_RPC_ADDRESS_KEY,
           RBFConfigKeys.DFS_ROUTER_RPC_ADDRESS_DEFAULT,
           RBFConfigKeys.DFS_ROUTER_RPC_PORT_DEFAULT);
-      setRpcServerAddress(rpcAddress);
+      setRpcServerAddress(ConfRpcAddress);
     }
   }