cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject [1/2] cxf git commit: Restore teh original bus, not set it to null
Date Wed, 15 Apr 2015 17:40:16 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 64a95b669 -> 0b29878b9


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

Branch: refs/heads/3.0.x-fixes
Commit: c1e3d655db0244c115297328d1296ddfc7fdc3e7
Parents: 64a95b6
Author: Daniel Kulp <dkulp@apache.org>
Authored: Wed Apr 15 13:35:45 2015 -0400
Committer: Daniel Kulp <dkulp@apache.org>
Committed: Wed Apr 15 13:40:06 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/c1e3d655/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 c224cd7..5fba47b 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();


Mime
View raw message