Mailing-List: contact commits-help@zookeeper.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@<zookeeper.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1702166 - in /zookeeper/branches/branch-3.5: CHANGES.txt
 src/java/main/org/apache/zookeeper/server/quorum/RemotePeerBean.java
 src/java/test/org/apache/zookeeper/server/quorum/TestRemotePeerBean.java
Date: Thu, 10 Sep 2015 04:46:22 -0000
To: commits@zookeeper.apache.org
From: rgs@apache.org
Message-Id: <20150910044622.4FEA9AC0041@hades.apache.org>

Author: rgs
Date: Thu Sep 10 04:46:21 2015
New Revision: 1702166

URL: http://svn.apache.org/r1702166
Log:
ZOOKEEPER-2269: NullPointerException in RemotePeerBean
(Arshad Mohammad via rgs)

Added:
    zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/server/quorum/TestRemotePeerBean.java
Modified:
    zookeeper/branches/branch-3.5/CHANGES.txt
    zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/quorum/RemotePeerBean.java

Modified: zookeeper/branches/branch-3.5/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/CHANGES.txt?rev=1702166&r1=1702165&r2=1702166&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.5/CHANGES.txt Thu Sep 10 04:46:21 2015
@@ -8,6 +8,9 @@ BUGFIXES:
   ZOOKEEPER-2264: Wrong error message when secureClientPortAddress is
   configured but secureClientPort is not configured (Arshad Mohammad via rakeshr)
 
+  ZOOKEEPER-2269: NullPointerException in RemotePeerBean
+  (Arshad Mohammad via rgs)
+
 IMPROVEMENTS:
 
   ZOOKEEPER-2270: Allow MBeanRegistry to be overridden for better unit tests

Modified: zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/quorum/RemotePeerBean.java
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/quorum/RemotePeerBean.java?rev=1702166&r1=1702165&r2=1702166&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/quorum/RemotePeerBean.java (original)
+++ zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/quorum/RemotePeerBean.java Thu Sep 10 04:46:21 2015
@@ -51,7 +51,11 @@ public class RemotePeerBean implements R
     }
 
     public String getClientAddress() {
-        return peer.clientAddr.getHostString() + ":" + peer.clientAddr.getPort();
+        if (null == peer.clientAddr) {
+            return "";
+        }
+        return peer.clientAddr.getHostString() + ":"
+                + peer.clientAddr.getPort();
     }
 
     public String getLearnerType() {

Added: zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/server/quorum/TestRemotePeerBean.java
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/server/quorum/TestRemotePeerBean.java?rev=1702166&view=auto
==============================================================================
--- zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/server/quorum/TestRemotePeerBean.java (added)
+++ zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/server/quorum/TestRemotePeerBean.java Thu Sep 10 04:46:21 2015
@@ -0,0 +1,45 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.zookeeper.server.quorum;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.net.InetSocketAddress;
+
+import org.apache.zookeeper.server.quorum.QuorumPeer.QuorumServer;
+import org.junit.Test;
+
+public class TestRemotePeerBean {
+
+    /**
+     * Test case for https://issues.apache.org/jira/browse/ZOOKEEPER-2269
+     */
+    @Test
+    public void testGetClientAddressShouldReturnEmptyStringWhenClientAddressIsNull() {
+        InetSocketAddress peerCommunicationAddress = null;
+        // Here peerCommunicationAddress is null, also clientAddr is null
+        QuorumServer peer = new QuorumServer(1, peerCommunicationAddress);
+        RemotePeerBean remotePeerBean = new RemotePeerBean(peer);
+        String clientAddress = remotePeerBean.getClientAddress();
+        assertNotNull(clientAddress);
+        assertEquals(0, clientAddress.length());
+    }
+
+}