You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by cs...@apache.org on 2016/07/26 12:56:19 UTC
cxf git commit: [CXF-6979] Avoid NPE
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes dd9de09aa -> e7c6b8128
[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/e7c6b812
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e7c6b812
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e7c6b812
Branch: refs/heads/3.1.x-fixes
Commit: e7c6b8128dc55d2d2ce3900a553b1098f327cfb5
Parents: dd9de09
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 14:56:02 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/e7c6b812/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 {