[CXF-7221] NullPointerException when using org.apache.cxf.logging.ena…

…ble and logging interceptors
apache · Jan 23, 2017 · 8c0c671 · 8c0c671
1 parent dd81c1e
commit 8c0c671
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/core/src/main/java/org/apache/cxf/interceptor/LoggingInInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/LoggingInInterceptor.java
@@ -78,7 +78,7 @@ public LoggingInInterceptor(String id, PrintWriter w) {
 
     public void handleMessage(Message message) throws Fault {
         Logger logger = getMessageLogger(message);
-        if (writer != null || logger.isLoggable(Level.INFO)) {
+        if (logger != null && (writer != null || logger.isLoggable(Level.INFO))) {
             logging(logger, message);
         }
     }

diff --git a/core/src/main/java/org/apache/cxf/interceptor/LoggingOutInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/LoggingOutInterceptor.java
@@ -69,7 +69,7 @@ public void handleMessage(Message message) throws Fault {
             return;
         }
         Logger logger = getMessageLogger(message);
-        if (logger.isLoggable(Level.INFO) || writer != null) {
+        if (logger != null && (logger.isLoggable(Level.INFO) || writer != null)) {
             // Write the output while caching it for the log message
             boolean hasLogged = message.containsKey(LOG_SETUP);
             if (!hasLogged) {