evenisse 2004/07/01 13:20:37
Modified: src/java/org/apache/maven/plugin Tag: MAVEN-1_0-BRANCH
PluginManager.java
Log:
[MAVEN-1352] Add a message to user when the plugins dirs reading generate an error.
Revision Changes Path
No revision
No revision
1.70.4.49 +13 -2 maven/src/java/org/apache/maven/plugin/PluginManager.java
Index: PluginManager.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/plugin/PluginManager.java,v
retrieving revision 1.70.4.48
retrieving revision 1.70.4.49
diff -u -r1.70.4.48 -r1.70.4.49
--- PluginManager.java 28 Jun 2004 09:39:09 -0000 1.70.4.48
+++ PluginManager.java 1 Jul 2004 20:20:36 -0000 1.70.4.49
@@ -241,7 +241,18 @@
// allow further customisation via a profile descriptor.
Map pluginFiles = getPluginFiles( pluginsDir, true );
- pluginFiles.putAll( getPluginFiles( userPluginsDir, false ) );
+ Map userPluginFiles = getPluginFiles( userPluginsDir, false );
+
+ if ( !Collections.EMPTY_MAP.equals( userPluginFiles ) &&
+ Collections.EMPTY_MAP.hashCode() == userPluginFiles.hashCode() )
+ {
+ pluginFiles.putAll( userPluginFiles );
+ }
+ else
+ {
+ throw new MavenException( "Maven was badly installed. Please reinstall
it." );
+ }
+
Map pluginDirs = expandPluginFiles( pluginFiles );
cacheManager.loadCache( unpackedPluginsDir );
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
