cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject [1/6] cxf git commit: [CXF-6979] Avoid NPE
Date Fri, 14 Oct 2016 17:13:49 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 4b8ade623 -> e802824d9


[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/90c5e9a0
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/90c5e9a0
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/90c5e9a0

Branch: refs/heads/3.0.x-fixes
Commit: 90c5e9a05aab7320ee5083515bd9b47c54d984d8
Parents: 4b8ade6
Author: Christian Schneider <chris@die-schneider.net>
Authored: Tue Jul 26 14:56:02 2016 +0200
Committer: Daniel Kulp <dkulp@apache.org>
Committed: Fri Oct 14 13:00:22 2016 -0400

----------------------------------------------------------------------
 .../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/90c5e9a0/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