You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2016/08/01 02:19:28 UTC
[02/16] cxf git commit: [CXF-6979] Avoid NPE
[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-jaxrs-2.1
Commit: d2be1f3b07e27675f8e53fac1adade3b223e9751
Parents: 87b4ca4
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Tue Jul 26 14:56:02 2016 +0200
Committer: Christian Schneider <ch...@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 {