svn commit: r1325315 - in /tomcat/maven-plugin/trunk: tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java

[olamy]

Author: olamy
Date: Thu Apr 12 15:14:56 2012
New Revision: 1325315

URL: http://svn.apache.org/viewvc?rev=1325315&view=rev
Log:
no need of a class field and cleanup extra assignement

Modified:
    
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java
    
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/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=1325315&r1=1325314&r2=1325315&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 15:14:56 2012
@@ -343,8 +343,6 @@ public abstract class AbstractRunMojo
      */
     private ClassRealm tomcatRealm;
 
-    private ClassLoader originalClassLoader;
-
     /**
      * The static context
      *
@@ -383,7 +381,7 @@ public abstract class AbstractRunMojo
             getLog().info( messagesProvider.getMessage( 
"AbstractRunMojo.nonWar" ) );
             return;
         }
-        originalClassLoader = Thread.currentThread().getContextClassLoader();
+        ClassLoader originalClassLoader = null;
         try
         {
 

Modified: 
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java?rev=1325315&r1=1325314&r2=1325315&view=diff
==============================================================================
--- 
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
 (original)
+++ 
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
 Thu Apr 12 15:14:56 2012
@@ -363,7 +363,6 @@ public abstract class AbstractRunMojo
      */
     private ClassRealm tomcatRealm;
 
-    private ClassLoader originalClassLoader;
 
     // ----------------------------------------------------------------------
     // Mojo Implementation
@@ -386,6 +385,7 @@ public abstract class AbstractRunMojo
             getLog().info( messagesProvider.getMessage( 
"AbstractRunMojo.nonWar" ) );
             return;
         }
+        ClassLoader originalClassLoader = null;
         if ( useSeparateTomcatClassLoader )
         {
             originalClassLoader = 
Thread.currentThread().getContextClassLoader();



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