Remove unnecessary isComplete() || isFailed() for `clientTunneledAu…

…thenticationInProgress` method
apache · Jun 29, 2017 · 22202ae · 22202ae
1 parent 49e9b01
commit 22202ae
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/src/java/main/org/apache/zookeeper/client/ZooKeeperSaslClient.java b/src/java/main/org/apache/zookeeper/client/ZooKeeperSaslClient.java
@@ -590,17 +590,15 @@ public boolean clientTunneledAuthenticationInProgress() {
                 // authentication is either in progress, successful, or failed.
 
                 // 1. Authentication hasn't finished yet: we must wait for it to do so.
-                if (!isComplete()) {
+                if (!isComplete() && !isFailed()) {
                     return true;
                 }
 
                 // 2. SASL authentication has succeeded or failed..
-                if (isComplete() || isFailed()) {
-                    if (!gotLastPacket) {
-                        // ..but still in progress, because there is a final SASL
-                        // message from server which must be received.
+                if (!gotLastPacket) {
+                    // ..but still in progress, because there is a final SASL
+                    // message from server which must be received.
                     return true;
-                    }
                 }
             }
             // Either client is not configured to use a tunnelled authentication