You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2006/03/13 20:44:12 UTC

svn commit: r385635 - /maven/components/branches/maven-2.0.x/maven-plugin-registry/src/main/java/org/apache/maven/plugin/registry/DefaultPluginRegistryBuilder.java

Author: jdcasey
Date: Mon Mar 13 11:44:10 2006
New Revision: 385635

URL: http://svn.apache.org/viewcvs?rev=385635&view=rev
Log:
[MNG-2146] Adding code to guard against NPE when maven.home and org.apache.maven.global-plugin-registry not specified.

Modified:
    maven/components/branches/maven-2.0.x/maven-plugin-registry/src/main/java/org/apache/maven/plugin/registry/DefaultPluginRegistryBuilder.java

Modified: maven/components/branches/maven-2.0.x/maven-plugin-registry/src/main/java/org/apache/maven/plugin/registry/DefaultPluginRegistryBuilder.java
URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-2.0.x/maven-plugin-registry/src/main/java/org/apache/maven/plugin/registry/DefaultPluginRegistryBuilder.java?rev=385635&r1=385634&r2=385635&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-plugin-registry/src/main/java/org/apache/maven/plugin/registry/DefaultPluginRegistryBuilder.java (original)
+++ maven/components/branches/maven-2.0.x/maven-plugin-registry/src/main/java/org/apache/maven/plugin/registry/DefaultPluginRegistryBuilder.java Mon Mar 13 11:44:10 2006
@@ -58,7 +58,8 @@
 
         getLogger().debug( "Building Maven user-level plugin registry from: '" + userRegistryFile.getAbsolutePath() + "'" );
 
-        if ( System.getProperty( "maven.home" ) != null )
+        if ( System.getProperty( "maven.home" ) != null ||
+             System.getProperty( MavenPluginRegistryBuilder.ALT_GLOBAL_PLUGIN_REG_LOCATION ) != null )
         {
             globalRegistryFile = getFile( globalRegistryPath, "maven.home", MavenPluginRegistryBuilder.ALT_GLOBAL_PLUGIN_REG_LOCATION );
 
@@ -94,7 +95,7 @@
     {
         PluginRegistry registry = null;
 
-        if ( registryFile.exists() && registryFile.isFile() )
+        if ( registryFile != null && registryFile.exists() && registryFile.isFile() )
         {
             FileReader reader = null;
             try