ZOOKEEPER-1134. ClientCnxnSocket string comparison using == rather than equals. (phunt via mahadev)

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

CHANGES.txt

@@ -260,6 +260,9 @@ BUGFIXES:
   ZOOKEEPER-1109. Zookeeper service is down when SyncRequestProcessor meets
   any exception. (Laxman via mahadev)
 
+  ZOOKEEPER-1134. ClientCnxnSocket string comparison using == rather than equals.
+  (phunt via mahadev) 
+
 IMPROVEMENTS:
   ZOOKEEPER-724. Improve junit test integration - log harness information 
   (phunt via mahadev)

src/java/main/org/apache/zookeeper/ClientCnxnSocket.java

@@ -26,11 +26,11 @@ import java.util.LinkedList;
 import java.util.List;
 
 import org.apache.jute.BinaryInputArchive;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.apache.zookeeper.ClientCnxn.Packet;
 import org.apache.zookeeper.proto.ConnectResponse;
 import org.apache.zookeeper.server.ByteBufferInputStream;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A ClientCnxnSocket does the lower level communication with a socket
@@ -116,12 +116,12 @@ abstract class ClientCnxnSocket {
 
     void readConnectResult() throws IOException {
         if (LOG.isTraceEnabled()) {
-            StringBuffer buf = new StringBuffer("0x[");
+            StringBuilder buf = new StringBuilder("0x[");
             for (byte b : incomingBuffer.array()) {
                 buf.append(Integer.toHexString(b) + ",");
             }
             buf.append("]");
-            LOG.trace("readConnectRestult " + incomingBuffer.remaining() + " "
+            LOG.trace("readConnectResult " + incomingBuffer.remaining() + " "
                     + buf.toString());
         }
         ByteBufferInputStream bbis = new ByteBufferInputStream(incomingBuffer);

src/java/main/org/apache/zookeeper/server/NIOServerCnxn.java

@@ -762,7 +762,7 @@ public class NIOServerCnxn extends ServerCnxn {
                 print("max_file_descriptor_count", unixos.getMaxFileDescriptorCount());
             }
 
-            if(stats.getServerState() == "leader") {
+            if(stats.getServerState().equals("leader")) {
                 Leader leader = ((LeaderZooKeeperServer)zkServer).getLeader();
 
                 print("followers", leader.learners.size());

src/java/main/org/apache/zookeeper/server/NettyServerCnxn.java

@@ -573,7 +573,7 @@ public class NettyServerCnxn extends ServerCnxn {
                 print("max_file_descriptor_count", unixos.getMaxFileDescriptorCount());
             }
 
-            if(stats.getServerState() == "leader") {
+            if(stats.getServerState().equals("leader")) {
                 Leader leader = ((LeaderZooKeeperServer)zkServer).getLeader();
 
                 print("followers", leader.learners.size());

src/java/main/org/apache/zookeeper/server/WatchManager.java

@@ -127,7 +127,7 @@ public class WatchManager {
      */
     @Override
     public synchronized String toString() {
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
 
         sb.append(watch2Paths.size()).append(" connections watching ")
             .append(watchTable.size()).append(" paths\n");

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

@@ -105,7 +105,7 @@ public class LeaderElection implements Election  {
         for (Vote v : validVotes.values()) {
             Integer count = countTable.get(v);
             if (count == null) {
-                count = Integer.valueOf(0);
+                count = 0;
             }
             countTable.put(v, count + 1);
             if (v.getId() == result.vote.getId()) {