You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@lucene.apache.org by ma...@apache.org on 2010/10/22 15:05:04 UTC

svn commit: r1026314 - /lucene/dev/trunk/solr/src/java/org/apache/solr/cloud/SolrZkServer.java

Author: markrmiller
Date: Fri Oct 22 13:05:03 2010
New Revision: 1026314

URL: http://svn.apache.org/viewvc?rev=1026314&view=rev
Log:
fix a little null pointer bug

Modified:
    lucene/dev/trunk/solr/src/java/org/apache/solr/cloud/SolrZkServer.java

Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/cloud/SolrZkServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/cloud/SolrZkServer.java?rev=1026314&r1=1026313&r2=1026314&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/cloud/SolrZkServer.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/cloud/SolrZkServer.java Fri Oct 22 13:05:03 2010
@@ -283,7 +283,7 @@ class SolrZkServerProps extends QuorumPe
     // 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;
       }