From 900f1635fce95466f9796b817ee0a4a740c3274c Mon Sep 17 00:00:00 2001
From: Mark Robert Miller <markrmiller@apache.org>
Date: Fri, 22 Oct 2010 13:05:03 +0000
Subject: [PATCH] fix a little null pointer bug

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1026314 13f79535-47bb-0310-9956-ffa450edef68
---
 solr/src/java/org/apache/solr/cloud/SolrZkServer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/solr/src/java/org/apache/solr/cloud/SolrZkServer.java b/solr/src/java/org/apache/solr/cloud/SolrZkServer.java
index d3ff0969f5e..d96718324aa 100644
--- a/solr/src/java/org/apache/solr/cloud/SolrZkServer.java
+++ b/solr/src/java/org/apache/solr/cloud/SolrZkServer.java
@@ -283,7 +283,7 @@ class SolrZkServerProps extends QuorumPeerConfig {
     // multiple matches... try to figure out by port.
     for (QuorumPeer.QuorumServer server : slist.values()) {
       if (server.addr.equals(thisAddr)) {
-        if (clientPortAddress != null || clientPortAddress.getPort() <= 0)
+        if (clientPortAddress == null || clientPortAddress.getPort() <= 0)
           setClientPort(server.addr.getPort() - 1);
         return server.id;
       }