You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by ph...@apache.org on 2013/10/11 21:18:14 UTC
svn commit: r1531396 - in /zookeeper/trunk: CHANGES.txt
src/java/main/org/apache/zookeeper/client/ZooKeeperSaslClient.java
src/java/main/org/apache/zookeeper/server/quorum/flexible/QuorumHierarchical.java
Author: phunt
Date: Fri Oct 11 19:18:14 2013
New Revision: 1531396
URL: http://svn.apache.org/r1531396
Log:
ZOOKEEPER-1610. Some classes are using == or != to compare Long/String objects instead of .equals() (Edward Ribeiro via phunt)
Modified:
zookeeper/trunk/CHANGES.txt
zookeeper/trunk/src/java/main/org/apache/zookeeper/client/ZooKeeperSaslClient.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/flexible/QuorumHierarchical.java
Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1531396&r1=1531395&r2=1531396&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Fri Oct 11 19:18:14 2013
@@ -442,6 +442,9 @@ BUGFIXES:
ZOOKEEPER-1624. PrepRequestProcessor abort multi-operation incorrectly. (thawan via camille)
+ ZOOKEEPER-1610. Some classes are using == or != to compare
+ Long/String objects instead of .equals() (Edward Ribeiro via phunt)
+
IMPROVEMENTS:
ZOOKEEPER-1170. Fix compiler (eclipse) warnings: unused imports,
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/client/ZooKeeperSaslClient.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/client/ZooKeeperSaslClient.java?rev=1531396&r1=1531395&r2=1531396&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/client/ZooKeeperSaslClient.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/client/ZooKeeperSaslClient.java Fri Oct 11 19:18:14 2013
@@ -330,10 +330,10 @@ public class ZooKeeperSaslClient {
if (saslClient.isComplete()) {
// GSSAPI: server sends a final packet after authentication succeeds
// or fails.
- if ((serverToken == null) && (saslClient.getMechanismName() == "GSSAPI"))
+ if ((serverToken == null) && (saslClient.getMechanismName().equals("GSSAPI")))
gotLastPacket = true;
// non-GSSAPI: no final packet from server.
- if (saslClient.getMechanismName() != "GSSAPI") {
+ if (!saslClient.getMechanismName().equals("GSSAPI")) {
gotLastPacket = true;
}
// SASL authentication is completed, successfully or not:
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/flexible/QuorumHierarchical.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/flexible/QuorumHierarchical.java?rev=1531396&r1=1531395&r2=1531396&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/flexible/QuorumHierarchical.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/flexible/QuorumHierarchical.java Fri Oct 11 19:18:14 2013
@@ -103,15 +103,15 @@ public class QuorumHierarchical implemen
if (qso == null || !qs.equals(qso)) return false;
}
for (Long sid: serverWeight.keySet()){
- if (serverWeight.get(sid) != qm.serverWeight.get(sid))
+ if (!serverWeight.get(sid).equals(qm.serverWeight.get(sid)))
return false;
}
for (Long sid: groupWeight.keySet()){
- if (groupWeight.get(sid) != qm.groupWeight.get(sid))
+ if (!groupWeight.get(sid).equals(qm.groupWeight.get(sid)))
return false;
}
for (Long sid: serverGroup.keySet()){
- if (serverGroup.get(sid) != qm.serverGroup.get(sid))
+ if (!serverGroup.get(sid).equals(qm.serverGroup.get(sid)))
return false;
}
return true;