You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by ma...@apache.org on 2011/07/25 23:31:34 UTC
svn commit: r1150922 - in /zookeeper/trunk: ./
src/java/main/org/apache/zookeeper/
src/java/main/org/apache/zookeeper/server/
src/java/main/org/apache/zookeeper/server/quorum/
Author: mahadev
Date: Mon Jul 25 21:31:33 2011
New Revision: 1150922
URL: http://svn.apache.org/viewvc?rev=1150922&view=rev
Log:
ZOOKEEPER-1134. ClientCnxnSocket string comparison using == rather than equals. (phunt via mahadev)
Modified:
zookeeper/trunk/CHANGES.txt
zookeeper/trunk/src/java/main/org/apache/zookeeper/ClientCnxnSocket.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/NIOServerCnxn.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/NettyServerCnxn.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/WatchManager.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/LeaderElection.java
Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1150922&r1=1150921&r2=1150922&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Mon Jul 25 21:31:33 2011
@@ -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)
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/ClientCnxnSocket.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/ClientCnxnSocket.java?rev=1150922&r1=1150921&r2=1150922&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/ClientCnxnSocket.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/ClientCnxnSocket.java Mon Jul 25 21:31:33 2011
@@ -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);
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/NIOServerCnxn.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/NIOServerCnxn.java?rev=1150922&r1=1150921&r2=1150922&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/NIOServerCnxn.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/NIOServerCnxn.java Mon Jul 25 21:31:33 2011
@@ -762,7 +762,7 @@ public class NIOServerCnxn extends Serve
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());
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/NettyServerCnxn.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/NettyServerCnxn.java?rev=1150922&r1=1150921&r2=1150922&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/NettyServerCnxn.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/NettyServerCnxn.java Mon Jul 25 21:31:33 2011
@@ -573,7 +573,7 @@ public class NettyServerCnxn extends Ser
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());
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/WatchManager.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/WatchManager.java?rev=1150922&r1=1150921&r2=1150922&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/WatchManager.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/WatchManager.java Mon Jul 25 21:31:33 2011
@@ -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");
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/LeaderElection.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/LeaderElection.java?rev=1150922&r1=1150921&r2=1150922&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/LeaderElection.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/LeaderElection.java Mon Jul 25 21:31:33 2011
@@ -105,7 +105,7 @@ public class LeaderElection implements E
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()) {