cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1569318 - in /cxf/branches/2.7.x-fixes: ./ rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFNonSpringServlet.java
Date Tue, 18 Feb 2014 13:38:58 GMT
Author: sergeyb
Date: Tue Feb 18 13:38:57 2014
New Revision: 1569318

URL: http://svn.apache.org/r1569318
Log:
Merged revisions 1569316 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1569316 | sergeyb | 2014-02-18 13:33:39 +0000 (Tue, 18 Feb 2014) | 1 line
  
  Minor update to CXFNonSpringServlet to allow for the overriding of the class loader initialization
........

Modified:
    cxf/branches/2.7.x-fixes/   (props changed)
    cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFNonSpringServlet.java

Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
  Merged /cxf/trunk:r1569316

Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFNonSpringServlet.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFNonSpringServlet.java?rev=1569318&r1=1569317&r2=1569318&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFNonSpringServlet.java
(original)
+++ cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFNonSpringServlet.java
Tue Feb 18 13:38:57 2014
@@ -76,7 +76,7 @@ public class CXFNonSpringServlet extends
             loadBus(sc);
         }
         if (this.bus != null) {
-            loader = bus.getExtension(ClassLoader.class);
+            loader = initClassLoader();
             ResourceManager resourceManager = bus.getExtension(ResourceManager.class);
             resourceManager.addResourceResolver(new ServletContextResourceResolver(sc.getServletContext()));
             if (destinationRegistry == null) {
@@ -88,6 +88,10 @@ public class CXFNonSpringServlet extends
         finalizeServletInit(sc);
     }
 
+    protected ClassLoader initClassLoader() {
+        return bus.getExtension(ClassLoader.class);
+    }
+    
     private static DestinationRegistry getDestinationRegistryFromBus(Bus bus) {
         DestinationFactoryManager dfm = bus.getExtension(DestinationFactoryManager.class);
         try {



Mime
View raw message