svn commit: r1325195 - /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java

[olamy]

Author: olamy
Date: Thu Apr 12 10:31:50 2012
New Revision: 1325195

URL: http://svn.apache.org/viewvc?rev=1325195&view=rev
Log:
[MTOMCAT-136] Tomcat7-maven-plugin 2.0-beta1 and useSeparateTomcatClassloader 
fails with run goal
fix issue for tomcat6 plugin too.

Modified:
    
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java

Modified: 
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java?rev=1325195&r1=1325194&r2=1325195&view=diff
==============================================================================
--- 
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java
 (original)
+++ 
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java
 Thu Apr 12 10:31:50 2012
@@ -343,6 +343,8 @@ public abstract class AbstractRunMojo
      */
     private ClassRealm tomcatRealm;
 
+    private ClassLoader originalClassLoaser;
+
     /**
      * The static context
      *
@@ -381,12 +383,13 @@ public abstract class AbstractRunMojo
             getLog().info( messagesProvider.getMessage( 
"AbstractRunMojo.nonWar" ) );
             return;
         }
-        ClassLoader originalClassLoaser = 
Thread.currentThread().getContextClassLoader();
+        originalClassLoaser = Thread.currentThread().getContextClassLoader();
         try
         {
+
             if ( useSeparateTomcatClassLoader )
             {
-                Thread.currentThread().setContextClassLoader( 
getTomcatClassLoader() );
+                originalClassLoaser = 
Thread.currentThread().getContextClassLoader();
             }
             getLog().info( messagesProvider.getMessage( 
"AbstractRunMojo.runningWar", getWebappUrl() ) );
 
@@ -765,10 +768,7 @@ public abstract class AbstractRunMojo
                 engine.addChild( host );
                 engine.setDefaultHost( host.getName() );
                 container.addEngine( engine );
-                if ( useSeparateTomcatClassLoader )
-                {
-                    engine.setParentClassLoader( getTomcatClassLoader() );
-                }
+
                 // create http connector
                 Connector httpConnector = container.createConnector( 
(InetAddress) null, port, protocol );
                 if ( httpsPort > 0 )
@@ -809,6 +809,11 @@ public abstract class AbstractRunMojo
                     ajpConnector.setURIEncoding( uriEncoding );
                     container.addConnector( ajpConnector );
                 }
+                if ( useSeparateTomcatClassLoader )
+                {
+                    Thread.currentThread().setContextClassLoader( 
getTomcatClassLoader() );
+                    engine.setParentClassLoader( getTomcatClassLoader() );
+                }
                 container.start();
             }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org