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 2013/02/20 16:39:57 UTC
svn commit: r1448245 - in /cxf/branches/2.7.x-fixes/rt/transports/http/src:
main/java/org/apache/cxf/transport/servlet/ServletController.java
test/java/org/apache/cxf/transport/servlet/ServletControllerTest.java
Author: dkulp
Date: Wed Feb 20 15:39:56 2013
New Revision: 1448245
URL: http://svn.apache.org/r1448245
Log:
Merged revisions 1448177 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1448177 | dkulp | 2013-02-20 09:17:47 -0500 (Wed, 20 Feb 2013) | 2 lines
Make sure the context classloader is set for REST requests. Simplify things a bit.
........
Modified:
cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java
cxf/branches/2.7.x-fixes/rt/transports/http/src/test/java/org/apache/cxf/transport/servlet/ServletControllerTest.java
Modified: cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java?rev=1448245&r1=1448244&r2=1448245&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java (original)
+++ cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java Wed Feb 20 15:39:56 2013
@@ -158,19 +158,21 @@ public class ServletController {
generateNotFound(request, res);
}
return false;
- } else { // the request should be a restful service request
- updateDestination(request, d);
- invokeDestination(request, res, d);
}
}
- } else {
- EndpointInfo ei = d.getEndpointInfo();
+ }
+ if (d != null) {
Bus bus = d.getBus();
ClassLoaderHolder orig = null;
try {
- ResourceManager manager = bus.getExtension(ResourceManager.class);
- if (manager != null) {
- ClassLoader loader = manager.resolveResource("", ClassLoader.class);
+ if (bus != null) {
+ ClassLoader loader = bus.getExtension(ClassLoader.class);
+ if (loader == null) {
+ ResourceManager manager = bus.getExtension(ResourceManager.class);
+ if (manager != null) {
+ loader = manager.resolveResource("", ClassLoader.class);
+ }
+ }
if (loader != null) {
//need to set the context classloader to the loader of the bundle
orig = ClassLoaderUtils.setThreadContextClassloader(loader);
@@ -178,21 +180,24 @@ public class ServletController {
}
updateDestination(request, d);
- QueryHandlerRegistry queryHandlerRegistry = bus.getExtension(QueryHandlerRegistry.class);
- if ("GET".equals(request.getMethod())
- && !StringUtils.isEmpty(request.getQueryString())
- && queryHandlerRegistry != null) {
-
- String ctxUri = request.getPathInfo();
- String baseUri = request.getRequestURL().toString()
- + "?" + request.getQueryString();
-
- QueryHandler selectedHandler =
- findQueryHandler(queryHandlerRegistry, ei, ctxUri, baseUri);
-
- if (selectedHandler != null) {
- respondUsingQueryHandler(selectedHandler, res, ei, ctxUri, baseUri);
- return true;
+ if (bus != null) {
+ QueryHandlerRegistry queryHandlerRegistry = bus.getExtension(QueryHandlerRegistry.class);
+ if ("GET".equals(request.getMethod())
+ && !StringUtils.isEmpty(request.getQueryString())
+ && queryHandlerRegistry != null) {
+
+ EndpointInfo ei = d.getEndpointInfo();
+ String ctxUri = request.getPathInfo();
+ String baseUri = request.getRequestURL().toString()
+ + "?" + request.getQueryString();
+
+ QueryHandler selectedHandler =
+ findQueryHandler(queryHandlerRegistry, ei, ctxUri, baseUri);
+
+ if (selectedHandler != null) {
+ respondUsingQueryHandler(selectedHandler, res, ei, ctxUri, baseUri);
+ return true;
+ }
}
}
invokeDestination(request, res, d);
Modified: cxf/branches/2.7.x-fixes/rt/transports/http/src/test/java/org/apache/cxf/transport/servlet/ServletControllerTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/transports/http/src/test/java/org/apache/cxf/transport/servlet/ServletControllerTest.java?rev=1448245&r1=1448244&r2=1448245&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/transports/http/src/test/java/org/apache/cxf/transport/servlet/ServletControllerTest.java (original)
+++ cxf/branches/2.7.x-fixes/rt/transports/http/src/test/java/org/apache/cxf/transport/servlet/ServletControllerTest.java Wed Feb 20 15:39:56 2013
@@ -135,6 +135,8 @@ public class ServletControllerTest exten
AbstractHTTPDestination dest = EasyMock.createMock(AbstractHTTPDestination.class);
registry.checkRestfulRequest("");
EasyMock.expectLastCall().andReturn(dest).atLeastOnce();
+ dest.getBus();
+ EasyMock.expectLastCall().andReturn(null).anyTimes();
dest.getMessageObserver();
EasyMock.expectLastCall().andReturn(EasyMock.createMock(MessageObserver.class)).atLeastOnce();