[thrift] branch master updated: THRIFT-4726: Remove SLF4J Logging Guards

[jking]

This is an automated email from the ASF dual-hosted git repository.

jking pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/thrift.git


The following commit(s) were added to refs/heads/master by this push:
     new 93e8ec2  THRIFT-4726: Remove SLF4J Logging Guards
93e8ec2 is described below

commit 93e8ec2d6a372cd6f68b7c11508ff7f8ea043f08
Author: Beluga Behr <dam6...@gmail.com>
AuthorDate: Sun Jan 6 15:20:02 2019 -0500

    THRIFT-4726: Remove SLF4J Logging Guards
---
 lib/java/src/org/apache/thrift/server/TThreadPoolServer.java |  8 +++-----
 lib/java/src/org/apache/thrift/transport/TSaslTransport.java | 12 +++++-------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/lib/java/src/org/apache/thrift/server/TThreadPoolServer.java 
b/lib/java/src/org/apache/thrift/server/TThreadPoolServer.java
index 3b5f21e..1697ad6 100644
--- a/lib/java/src/org/apache/thrift/server/TThreadPoolServer.java
+++ b/lib/java/src/org/apache/thrift/server/TThreadPoolServer.java
@@ -320,11 +320,9 @@ public class TThreadPoolServer extends TServer {
         // Ignore err-logging all transport-level/type exceptions
         if ((realCause != null && realCause instanceof TTransportException)
             || (x instanceof TTransportException)) {
-          if (LOGGER.isDebugEnabled()) {
-            // Write to debug, just in case the exception gets required
-            LOGGER
-                .debug("Received TTransportException during processing of 
message, ignoring: ", x);
-          }
+          LOGGER.debug(
+              "Received TTransportException during processing of message. 
Ignoring.",
+              x);
         } else {
           // Log the exception at error level and continue
           LOGGER.error("Error occurred during processing of message.", x);
diff --git a/lib/java/src/org/apache/thrift/transport/TSaslTransport.java 
b/lib/java/src/org/apache/thrift/transport/TSaslTransport.java
index 80f3557..bed3b39 100644
--- a/lib/java/src/org/apache/thrift/transport/TSaslTransport.java
+++ b/lib/java/src/org/apache/thrift/transport/TSaslTransport.java
@@ -158,9 +158,9 @@ abstract class TSaslTransport extends TTransport {
     messageHeader[0] = status.getValue();
     EncodingUtils.encodeBigEndian(payload.length, messageHeader, STATUS_BYTES);
 
-    if (LOGGER.isDebugEnabled())
-      LOGGER.debug(getRole() + ": Writing message with status {} and payload 
length {}",
-                   status, payload.length);
+    LOGGER.debug("{}: Writing message with status {} and payload length {}",
+        getRole(), status, payload.length);
+
     underlyingTransport.write(messageHeader);
     underlyingTransport.write(payload);
     underlyingTransport.flush();
@@ -197,10 +197,8 @@ abstract class TSaslTransport extends TTransport {
       String remoteMessage = new String(payload, StandardCharsets.UTF_8);
       throw new TTransportException("Peer indicated failure: " + 
remoteMessage);
     }
-
-    if (LOGGER.isDebugEnabled())
-      LOGGER.debug(getRole() + ": Received message with status {} and payload 
length {}",
-                   status, payload.length);
+    LOGGER.debug("{}: Received message with status {} and payload length {}",
+        getRole(), status, payload.length);
     return new SaslResponse(status, payload);
   }