Index: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
===================================================================
--- hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java	(revision 1205242)
+++ hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java	(working copy)
@@ -264,7 +264,11 @@
 
   protected InetSocketAddress getRpcServerAddress(Configuration conf)
       throws IOException {
-    return getAddress(conf);
+	String addr = conf.get(DFS_NAMENODE_RPC_ADDRESS_KEY);
+	if (addr == null || addr.isEmpty()) {
+		return getAddress(conf);
+	}
+    return getAddress(addr);
   }
   
   /**