You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ra...@apache.org on 2008/03/13 21:38:56 UTC

svn commit: r636873 - in /maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype: mojos/CreateArchetypeFromProjectMojo.java ui/DefaultArchetypeCreationConfigurator.java

Author: rafale
Date: Thu Mar 13 13:38:54 2008
New Revision: 636873

URL: http://svn.apache.org/viewvc?rev=636873&view=rev
Log:
Fix the NPE when property File is not given

Modified:
    maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeFromProjectMojo.java
    maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeCreationConfigurator.java

Modified: maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeFromProjectMojo.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeFromProjectMojo.java?rev=636873&r1=636872&r2=636873&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeFromProjectMojo.java (original)
+++ maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeFromProjectMojo.java Thu Mar 13 13:38:54 2008
@@ -241,7 +241,7 @@
             getLog().debug("Found in command line extensions = " + filteredExtensions);
         }
 
-        if( filteredExtensions.isEmpty() && propertyFile.exists() )
+        if( filteredExtensions.isEmpty() && propertyFile != null && propertyFile.exists() )
         {
             try
             {
@@ -282,7 +282,7 @@
             getLog().debug("Found in command line languages = " + resultingLanguages);
         }
 
-        if( resultingLanguages.isEmpty() && propertyFile.exists() )
+        if( resultingLanguages.isEmpty() && propertyFile != null && propertyFile.exists() )
         {
             try
             {

Modified: maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeCreationConfigurator.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeCreationConfigurator.java?rev=636873&r1=636872&r2=636873&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeCreationConfigurator.java (original)
+++ maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeCreationConfigurator.java Thu Mar 13 13:38:54 2008
@@ -390,13 +390,16 @@
     {
         Properties properties = new Properties();
 
-        try
+        if ( propertyFile != null )
         {
-            readProperties( properties, propertyFile );
-        }
-        catch ( FileNotFoundException ex )
-        {
-            getLogger().debug( "archetype.properties does not exist" );
+            try
+            {
+                readProperties( properties, propertyFile );
+            }
+            catch ( FileNotFoundException ex )
+            {
+                getLogger().debug( "archetype.properties does not exist" );
+            }
         }
 
         return properties;