ZOOKEEPER-249. QuorumPeer.getClientPort() always returns -1. (nitay joffe via mahadev)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/zookeeper/trunk@724607 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -41,12 +41,14 @@ daroch and ben reed via mahadev)
 
    ZOOKEEPER-232. fix apache licence header in TestableZookeeper (mahadev)
 
+   ZOOKEEPER-249. QuorumPeer.getClientPort() always returns -1. (nitay 
+joffe via mahadev)
+
 IMPROVEMENTS:
    
    ZOOKEEPER-64. Log system env information when initializing server and
 client (pat via mahadev)
 
-
 Release 3.0.0 - 2008-10-21
 
 Non-backward compatible changes:

src/java/main/org/apache/zookeeper/server/quorum/QuorumPeer.java

@@ -574,7 +574,7 @@ public class QuorumPeer extends Thread implements QuorumStats.Provider {
     }
 
     public int getClientPort() {
-        return -1;
+        return cnxnFactory.getLocalPort();
     }
 
     public void setClientPort(int clientPort) {

src/java/test/org/apache/zookeeper/test/QuorumTest.java

@@ -74,14 +74,19 @@ public class QuorumTest extends ClientBase {
         
         LOG.info("creating QuorumPeer 1");
         s1 = new QuorumPeer(peers, s1dir, s1dir, 2181, 0, 1, tickTime, initLimit, syncLimit);
+        assertEquals(2181, s1.getClientPort());
         LOG.info("creating QuorumPeer 2");
         s2 = new QuorumPeer(peers, s2dir, s2dir, 2182, 0, 2, tickTime, initLimit, syncLimit);
+        assertEquals(2182, s2.getClientPort());
         LOG.info("creating QuorumPeer 3");
         s3 = new QuorumPeer(peers, s3dir, s3dir, 2183, 0, 3, tickTime, initLimit, syncLimit);
+        assertEquals(2183, s3.getClientPort());
         LOG.info("creating QuorumPeer 4");
         s4 = new QuorumPeer(peers, s4dir, s4dir, 2184, 0, 4, tickTime, initLimit, syncLimit);
+        assertEquals(2184, s4.getClientPort());
         LOG.info("creating QuorumPeer 5");
         s5 = new QuorumPeer(peers, s5dir, s5dir, 2185, 0, 5, tickTime, initLimit, syncLimit);
+        assertEquals(2185, s5.getClientPort());
         LOG.info("start QuorumPeer 1");
         s1.start();
         LOG.info("start QuorumPeer 2");