svn commit: r633054 - /maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java

[vsiveton]

Author: vsiveton
Date: Mon Mar  3 04:09:01 2008
New Revision: 633054

URL: http://svn.apache.org/viewvc?rev=633054&view=rev
Log:
o merged from r633053 (fixed potential NPE)

Modified:
    
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java

Modified: 
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java?rev=633054&r1=633053&r2=633054&view=diff
==============================================================================
--- 
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
 (original)
+++ 
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
 Mon Mar  3 04:09:01 2008
@@ -53,18 +53,26 @@
             Properties properties = new Properties();
             resourceAsStream = MavenCli.class.getClassLoader()
                                              .getResourceAsStream( 
"META-INF/maven/org.apache.maven/maven-core/pom.properties" );
-            properties.load( resourceAsStream );
 
-            if ( properties.getProperty( "builtOn" ) != null )
+            if ( resourceAsStream != null )
             {
-                System.out.println( "Maven version: "
-                                    + properties.getProperty( "version", 
"unknown" ) + " built on "
-                                    + properties.getProperty( "builtOn" ) );
+                properties.load( resourceAsStream );
+
+                if ( properties.getProperty( "builtOn" ) != null )
+                {
+                    System.out.println( "Maven version: "
+                                        + properties.getProperty( "version", 
"unknown" ) + " built on "
+                                        + properties.getProperty( "builtOn" ) 
);
+                }
+                else
+                {
+                    System.out.println( "Maven version: "
+                                        + properties.getProperty( "version", 
"unknown" ) );
+                }
             }
             else
             {
-                System.out.println( "Maven version: "
-                                    + properties.getProperty( "version", 
"unknown" ) );
+                System.out.println( "Maven version: unknown" );
             }
 
             System.out.println( "Java version: "