You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2015/04/15 20:23:21 UTC
[3/6] cxf git commit: Restore teh original bus, not set it to null
Restore teh original bus, not set it to null
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/13c80cfd
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/13c80cfd
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/13c80cfd
Branch: refs/heads/2.7.x-fixes
Commit: 13c80cfdd6299f184eedc4ae639dd882953f1a32
Parents: 7552cae
Author: Daniel Kulp <dk...@apache.org>
Authored: Wed Apr 15 13:35:45 2015 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Wed Apr 15 14:22:00 2015 -0400
----------------------------------------------------------------------
.../java/org/apache/cxf/transport/servlet/CXFNonSpringServlet.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/13c80cfd/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFNonSpringServlet.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFNonSpringServlet.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFNonSpringServlet.java
index 2a6b8a2..f3f3ca9 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFNonSpringServlet.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFNonSpringServlet.java
@@ -171,7 +171,7 @@ public class CXFNonSpringServlet extends AbstractHTTPServlet {
controller.invoke(request, response);
} finally {
if (origBus != bus) {
- BusFactory.setThreadDefaultBus(null);
+ BusFactory.setThreadDefaultBus(origBus);
}
if (origLoader != null) {
origLoader.reset();