You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/07/28 16:39:09 UTC
svn commit: r798536 -
/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
Author: bentmann
Date: Tue Jul 28 14:39:09 2009
New Revision: 798536
URL: http://svn.apache.org/viewvc?rev=798536&view=rev
Log:
o Fixed NPE
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java?rev=798536&r1=798535&r2=798536&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java Tue Jul 28 14:39:09 2009
@@ -707,19 +707,22 @@
{
Metadata pluginMetadata = readMetadata( artifactMetadataFile );
- String release = pluginMetadata.getVersioning().getRelease();
-
- if ( StringUtils.isNotEmpty( release ) )
- {
- plugin.setVersion( release );
- }
- else
+ if ( pluginMetadata.getVersioning() != null )
{
- String latest = pluginMetadata.getVersioning().getLatest();
+ String release = pluginMetadata.getVersioning().getRelease();
- if ( StringUtils.isNotEmpty( latest ) )
+ if ( StringUtils.isNotEmpty( release ) )
+ {
+ plugin.setVersion( release );
+ }
+ else
{
- plugin.setVersion( latest );
+ String latest = pluginMetadata.getVersioning().getLatest();
+
+ if ( StringUtils.isNotEmpty( latest ) )
+ {
+ plugin.setVersion( latest );
+ }
}
}
}