cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cschnei...@apache.org
Subject cxf git commit: [CXF-6979] Avoid NPE
Date Tue, 26 Jul 2016 13:03:57 GMT
Repository: cxf
Updated Branches:
  refs/heads/master 87b4ca436 -> d2be1f3b0


[CXF-6979] Avoid NPE


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d2be1f3b
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d2be1f3b
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d2be1f3b

Branch: refs/heads/master
Commit: d2be1f3b07e27675f8e53fac1adade3b223e9751
Parents: 87b4ca4
Author: Christian Schneider <chris@die-schneider.net>
Authored: Tue Jul 26 14:56:02 2016 +0200
Committer: Christian Schneider <chris@die-schneider.net>
Committed: Tue Jul 26 15:03:47 2016 +0200

----------------------------------------------------------------------
 .../java/org/apache/cxf/transport/servlet/ServletController.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/d2be1f3b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java
b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java
index 817fb45..dbd59ad 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java
@@ -187,7 +187,7 @@ public class ServletController {
                     }
                 }
             }
-            if (d != null) {
+            if (d != null && d.getMessageObserver() != null) {
                 Bus bus = d.getBus();
                 ClassLoaderHolder orig = null;
                 try {


Mime
View raw message