You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ca...@apache.org on 2006/06/09 19:00:43 UTC
svn commit: r413091 - in /maven/components/trunk:
maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
Author: carlos
Date: Fri Jun 9 10:00:43 2006
New Revision: 413091
URL: http://svn.apache.org/viewvc?rev=413091&view=rev
Log:
[MNG-2357] Refactor code
Submitted by: Jerome Lacoste
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=413091&r1=413090&r2=413091&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java Fri Jun 9 10:00:43 2006
@@ -289,6 +289,11 @@
// circle around and set the artifacts and class realm
PluginDescriptor addedPlugin = pluginCollector.getPluginDescriptor( plugin );
+ if ( addedPlugin == null )
+ {
+ throw new IllegalStateException( "The PluginDescriptor for the plugin " + plugin + " was not found." );
+ }
+
addedPlugin.setClassRealm( child.getContainerRealm() );
// we're only setting the plugin's artifact itself as the artifact list, to allow it to be retrieved
Modified: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java?rev=413091&r1=413090&r2=413091&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java (original)
+++ maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java Fri Jun 9 10:00:43 2006
@@ -70,17 +70,12 @@
URL resourceUrl = cloader.getResource( resource );
- File resourceFile = null;
- if ( resourceUrl != null )
- {
- resourceFile = new File( resourceUrl.getPath() );
- }
- else
+ if ( resourceUrl == null )
{
throw new FileNotFoundException( "Unable to find: " + resource );
}
- return resourceFile;
+ return new File( resourceUrl.getPath() );
}
protected ArtifactRepository getLocalRepository()