Author: olamy
Date: Mon Jun 18 14:57:32 2012
New Revision: 1351375
URL: http://svn.apache.org/viewvc?rev=1351375&view=rev
Log:
[MTOMCAT-162] SaxException when deploying multiple WARs
Submitted by Neale Upstone.
Modified:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunMojo.java
Modified:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunMojo.java?rev=1351375&r1=1351374&r2=1351375&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunMojo.java
Mon Jun 18 14:57:32 2012
@@ -86,7 +86,7 @@ public class RunMojo
* @see
http://tomcat.apache.org/tomcat-6.0-doc/api/org/apache/catalina/loader/WebappLoader.html#setDelegate(boolean)
* @since 1.0
*/
- private boolean delegate = true;
+ private final boolean delegate = true;
/**
* represents the delay in seconds between each classPathScanning change
invocation
@@ -127,8 +127,6 @@ public class RunMojo
*/
private List<String> additionalClasspathDirs;
- private File temporaryContextFile = null;
-
// ----------------------------------------------------------------------
// AbstractRunMojo Implementation
// ----------------------------------------------------------------------
@@ -205,16 +203,16 @@ public class RunMojo
{
for ( String additionalClasspathDir : additionalClasspathDirs )
{
- if( StringUtils.isNotBlank(additionalClasspathDir))
- {
- File file = new File( additionalClasspathDir );
- if ( file.exists() )
- {
- String fileUri = file.toURI().toString();
- getLog().debug( "add file:" + fileUri + " as a
additionalClasspathDir" );
- loader.addRepository( fileUri );
- }
- }
+ if ( StringUtils.isNotBlank( additionalClasspathDir ) )
+ {
+ File file = new File( additionalClasspathDir );
+ if ( file.exists() )
+ {
+ String fileUri = file.toURI().toString();
+ getLog().debug( "add file:" + fileUri + " as a
additionalClasspathDir" );
+ loader.addRepository( fileUri );
+ }
+ }
}
}
}
@@ -243,10 +241,8 @@ public class RunMojo
protected File getContextFile()
throws MojoExecutionException
{
- if ( temporaryContextFile != null )
- {
- return temporaryContextFile;
- }
+ File temporaryContextFile = null;
+
//----------------------------------------------------------------------------
// context attributes backgroundProcessorDelay reloadable cannot be
modified at runtime.
// It looks only values from the file ared used
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
