Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BE9EBE36B for ; Wed, 20 Feb 2013 15:40:18 +0000 (UTC) Received: (qmail 10186 invoked by uid 500); 20 Feb 2013 15:40:18 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 10071 invoked by uid 500); 20 Feb 2013 15:40:18 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 10048 invoked by uid 99); 20 Feb 2013 15:40:17 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 Feb 2013 15:40:17 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 Feb 2013 15:40:16 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 719172388A33; Wed, 20 Feb 2013 15:39:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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 Date: Wed, 20 Feb 2013 15:39:57 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130220153957.719172388A33@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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();