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:19:19 UTC
svn commit: r1531397 - in /zookeeper/branches/branch-3.4: CHANGES.txt
src/java/main/org/apache/zookeeper/client/ZooKeeperSaslClient.java
Author: phunt
Date: Fri Oct 11 19:19:18 2013
New Revision: 1531397
URL: http://svn.apache.org/r1531397
Log:
ZOOKEEPER-1610. Some classes are using == or != to compare Long/String objects instead of .equals() (Edward Ribeiro via phunt)
Modified:
zookeeper/branches/branch-3.4/CHANGES.txt
zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/client/ZooKeeperSaslClient.java
Modified: zookeeper/branches/branch-3.4/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/CHANGES.txt?rev=1531397&r1=1531396&r2=1531397&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.4/CHANGES.txt Fri Oct 11 19:19:18 2013
@@ -130,6 +130,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-1564. Allow JUnit test build with IBM Java
Modified: zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/client/ZooKeeperSaslClient.java
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/client/ZooKeeperSaslClient.java?rev=1531397&r1=1531396&r2=1531397&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/client/ZooKeeperSaslClient.java (original)
+++ zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/client/ZooKeeperSaslClient.java Fri Oct 11 19:19:18 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: