svn commit: r1584418 - in /tomee/tomee/trunk: server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java

[rmannibucau]

Author: rmannibucau
Date: Thu Apr  3 21:53:22 2014
New Revision: 1584418

URL: http://svn.apache.org/r1584418
Log:
TOMEE-1164  TOMEE-1165 cxf context not correctly cleaned up

Modified:
    
tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
    
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java

Modified: 
tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java?rev=1584418&r1=1584417&r2=1584418&view=diff
==============================================================================
--- 
tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
 (original)
+++ 
tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
 Thu Apr  3 21:53:22 2014
@@ -336,7 +336,7 @@ public class CxfRsHttpListener implement
         final ClassLoader oldLoader = 
Thread.currentThread().getContextClassLoader();
         Thread.currentThread().setContextClassLoader(CxfUtil.initBusLoader());
         try {
-            server.stop();
+            server.destroy();
         } catch (final RuntimeException ise) {
             LOGGER.warning("Can't stop correctly the endpoint " + server);
             if (LOGGER.isDebugEnabled()) {

Modified: 
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java?rev=1584418&r1=1584417&r2=1584418&view=diff
==============================================================================
--- 
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
 (original)
+++ 
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
 Thu Apr  3 21:53:22 2014
@@ -1083,8 +1083,6 @@ public class TomcatWebAppBuilder impleme
     private void startInternal(final StandardContext standardContext) {
         if (isIgnored(standardContext)) return;
 
-        
forceWebAppLoaderToGetAParent(standardContext.getLoader().getClassLoader(), 
standardContext.getParentClassLoader());
-
         final CoreContainerSystem cs = getContainerSystem();
 
         final Assembler a = getAssembler();
@@ -1373,18 +1371,6 @@ public class TomcatWebAppBuilder impleme
         }
     }
 
-    private void forceWebAppLoaderToGetAParent(final ClassLoader classLoader, 
final ClassLoader parent) {
-        if (!LazyStopWebappClassLoader.class.isInstance(classLoader)) {
-            return;
-        }
-
-        // workaround since tomcat doesn't support reload anymore
-        if (Reflections.get(classLoader, "parent") == null) { // then the 
current loader was reloaded and is now broken if we need parent
-            // this algorithm is broken for ears but ears will not be reloaded 
this way normally
-            Reflections.set(classLoader, "parent", parent);
-        }
-    }
-
     private static File rootPath(final File file) {
         if (file.isDirectory() && file.getName().equals("classes") && 
file.getParentFile() != null && 
file.getParentFile().getName().equals("WEB-INF")) {
             return file.getParentFile().getParentFile();