Author: olamy
Date: Wed Oct 1 23:43:18 2014
New Revision: 1628865
URL: http://svn.apache.org/r1628865
Log:
partially revert bad commit r1628603
Modified:
tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/RunMojo.java
Modified:
tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/RunMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/RunMojo.java?rev=1628865&r1=1628864&r2=1628865&view=diff
==============================================================================
---
tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/RunMojo.java
(original)
+++
tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/RunMojo.java
Wed Oct 1 23:43:18 2014
@@ -340,8 +340,7 @@ public class RunMojo
getLog().debug( "classLoaderEntriesCalculator urls: " + urls );
- final URLClassLoader urlClassLoader = new URLClassLoader(
urls.toArray( new URL[urls.size()] ), //
-
Thread.currentThread().getContextClassLoader() );
+ final URLClassLoader urlClassLoader = new URLClassLoader(
urls.toArray( new URL[urls.size()] ) );
final ClassRealm pluginRealm = getTomcatClassLoader();
@@ -356,12 +355,6 @@ public class RunMojo
public WebResource getClassLoaderResource( String path )
{
- if (previous.getState().isAvailable())
- {
- WebResource webResource =
previous.getClassLoaderResource( path );
- log.debug( "foo" );
- }
-
log.debug( "RunMojo#getClassLoaderResource: " + path );
URL url = urlClassLoader.getResource(
StringUtils.removeStart( path, "/" ) );
// search in parent (plugin) classloader
@@ -370,7 +363,7 @@ public class RunMojo
url = pluginRealm.getResource(
StringUtils.removeStart( path, "/" ) );
}
- if (url == null)
+ if ( url == null )
{
// try in reactors
List<WebResource> webResources =
findResourcesInDirectories( path, //
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
