You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ol...@apache.org on 2016/08/16 01:07:14 UTC
svn commit: r1756458 -
/tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/RunMojo.java
Author: olamy
Date: Tue Aug 16 01:07:14 2016
New Revision: 1756458
URL: http://svn.apache.org/viewvc?rev=1756458&view=rev
Log:
partially revert bad commit r1628603
Modified:
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/RunMojo.java
Modified: tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/RunMojo.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/RunMojo.java?rev=1756458&r1=1756457&r2=1756458&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/RunMojo.java (original)
+++ tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/RunMojo.java Tue Aug 16 01:07:14 2016
@@ -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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org