Index: src/test/java/org/apache/hadoop/hbase/zookeeper/TestHQuorumPeer.java =================================================================== --- src/test/java/org/apache/hadoop/hbase/zookeeper/TestHQuorumPeer.java (revision 1153174) +++ src/test/java/org/apache/hadoop/hbase/zookeeper/TestHQuorumPeer.java (working copy) @@ -132,14 +132,11 @@ assertEquals("foo.bar", server.addr.getHostName()); } - /** - * Test Case for HBASE-2305 - */ @Test public void testShouldAssignDefaultZookeeperClientPort() { Configuration config = HBaseConfiguration.create(); config.clear(); Properties p = ZKConfig.makeZKProps(config); assertNotNull(p); - assertEquals(2181, p.get("hbase.zookeeper.property.clientPort")); + assertEquals(2181, p.get("clientPort")); } } Index: src/main/java/org/apache/hadoop/hbase/zookeeper/ZKConfig.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/zookeeper/ZKConfig.java (revision 1153174) +++ src/main/java/org/apache/hadoop/hbase/zookeeper/ZKConfig.java (working copy) @@ -47,8 +47,7 @@ private static final String ZK_CFG_PROPERTY = "hbase.zookeeper.property."; private static final int ZK_CFG_PROPERTY_SIZE = ZK_CFG_PROPERTY.length(); - private static final String ZK_CLIENT_PORT_KEY = ZK_CFG_PROPERTY - + "clientPort"; + private static final String ZK_CLIENT_PORT_KEY = "clientPort"; /** * Make a Properties object holding ZooKeeper config equivalent to zoo.cfg.