You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by vs...@apache.org on 2008/03/03 13:07:31 UTC
svn commit: r633053 -
/maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
Author: vsiveton
Date: Mon Mar 3 04:07:21 2008
New Revision: 633053
URL: http://svn.apache.org/viewvc?rev=633053&view=rev
Log:
o fixed potential NPE
Modified:
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
Modified: maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java?rev=633053&r1=633052&r2=633053&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java (original)
+++ maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java Mon Mar 3 04:07:21 2008
@@ -536,16 +536,24 @@
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: " + System.getProperty( "java.version", "<unknown java version>" ) );