You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by rg...@apache.org on 2015/09/10 06:35:53 UTC
svn commit: r1702163 - in /zookeeper/trunk: CHANGES.txt
src/java/main/org/apache/zookeeper/server/quorum/RemotePeerBean.java
src/java/test/org/apache/zookeeper/server/quorum/TestRemotePeerBean.java
Author: rgs
Date: Thu Sep 10 04:35:52 2015
New Revision: 1702163
URL: http://svn.apache.org/r1702163
Log:
ZOOKEEPER-2269: NullPointerException in RemotePeerBean
(Arshad Mohammad via rgs)
Added:
zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/TestRemotePeerBean.java
Modified:
zookeeper/trunk/CHANGES.txt
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/RemotePeerBean.java
Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1702163&r1=1702162&r2=1702163&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Thu Sep 10 04:35:52 2015
@@ -167,6 +167,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-1660 Documentation for Dynamic Reconfiguration (Reed Wanderman-Milne via shralex)
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/RemotePeerBean.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/RemotePeerBean.java?rev=1702163&r1=1702162&r2=1702163&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/RemotePeerBean.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/RemotePeerBean.java Thu Sep 10 04:35:52 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/trunk/src/java/test/org/apache/zookeeper/server/quorum/TestRemotePeerBean.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/TestRemotePeerBean.java?rev=1702163&view=auto
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/TestRemotePeerBean.java (added)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/TestRemotePeerBean.java Thu Sep 10 04:35:52 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());
+ }
+
+}