fix potential NPE and repeated conditional test (apache#5776)

### Motivation fix potential NPE and repeated conditional test ### Modifications local changes
vruc · Dec 6, 2019 · 3a695cd · 3a695cd
1 parent d74c1ac
commit 3a695cd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ClientCnx.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ClientCnx.java
@@ -308,7 +308,7 @@ protected void handleConnected(CommandConnected connected) {
     @Override
     protected void handleAuthChallenge(CommandAuthChallenge authChallenge) {
         checkArgument(authChallenge.hasChallenge());
-        checkArgument(authChallenge.getChallenge().hasAuthData() && authChallenge.getChallenge().hasAuthData());
+        checkArgument(authChallenge.getChallenge().hasAuthData());
 
         // mutual authn. If auth not complete, continue auth; if auth complete, complete connectionFuture.
         try {

diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ProducerImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ProducerImpl.java
@@ -947,7 +947,8 @@ protected boolean verifyLocalBufferIsNotCorrupted(OpSendMsg op) {
             }
             return true;
         } else {
-            log.warn("[{}] Failed while casting {} into ByteBufPair", producerName, op.cmd.getClass().getName());
+            log.warn("[{}] Failed while casting {} into ByteBufPair", producerName,
+                    (op.cmd == null ? null : op.cmd.getClass().getName()));
             return false;
         }
     }
@@ -1253,7 +1254,8 @@ private void stripChecksum(OpSendMsg op) {
                 headerFrame.resetReaderIndex();
             }
         } else {
-            log.warn("[{}] Failed while casting {} into ByteBufPair", producerName, op.cmd.getClass().getName());
+            log.warn("[{}] Failed while casting {} into ByteBufPair", producerName,
+                    (op.cmd == null ? null : op.cmd.getClass().getName()));
         }
     }