You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ah...@apache.org on 2008/11/27 00:44:52 UTC
svn commit: r721038 - in /maven/release/trunk/maven-release-manager/src:
main/java/org/apache/maven/shared/release/util/ReleaseUtil.java
test/java/org/apache/maven/shared/release/util/
test/java/org/apache/maven/shared/release/util/ReleaseUtilTest.java
Author: aheritier
Date: Wed Nov 26 15:44:52 2008
New Revision: 721038
URL: http://svn.apache.org/viewvc?rev=721038&view=rev
Log:
MRELEASE-273: NullPointerException at end of standalone "release:perform"
http://jira.codehaus.org/browse/MRELEASE-273
Added:
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/util/
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/util/ReleaseUtilTest.java (with props)
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/ReleaseUtil.java
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/ReleaseUtil.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/ReleaseUtil.java?rev=721038&r1=721037&r2=721038&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/ReleaseUtil.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/ReleaseUtil.java Wed Nov 26 15:44:52 2008
@@ -66,11 +66,16 @@
public static File getStandardPom( MavenProject project )
{
+ if ( project == null )
+ return null;
+
File pom = project.getFile();
- File releasePom = getReleasePom( project );
- // MRELEASE-273 : pom can be null here
- if ( pom != null && pom.equals( releasePom ) )
+ if ( pom == null )
+ return null;
+
+ File releasePom = getReleasePom( project );
+ if ( pom.equals( releasePom ) )
{
pom = new File( pom.getParent(), POMv4 );
}
@@ -80,7 +85,15 @@
public static File getReleasePom( MavenProject project )
{
- return new File( project.getFile().getParent(), RELEASE_POMv4 );
+ if ( project == null )
+ return null;
+
+ File pom = project.getFile();
+
+ if ( pom == null )
+ return null;
+
+ return new File( pom.getParent(), RELEASE_POMv4 );
}
/**
Added: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/util/ReleaseUtilTest.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/util/ReleaseUtilTest.java?rev=721038&view=auto
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/util/ReleaseUtilTest.java (added)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/util/ReleaseUtilTest.java Wed Nov 26 15:44:52 2008
@@ -0,0 +1,26 @@
+/**
+ *
+ */
+package org.apache.maven.shared.release.util;
+
+import org.codehaus.plexus.PlexusTestCase;
+
+/**
+ * Tests for ReleaseUtil methods
+ *
+ * @author aheritier
+ */
+public class ReleaseUtilTest
+ extends PlexusTestCase
+{
+ /**
+ * MRELEASE-273 : Tests if there no pom passed as parameter
+ */
+ public void testProjectIsNull()
+ throws Exception
+ {
+ assertNull( ReleaseUtil.getReleasePom( null ) );
+ assertNull( ReleaseUtil.getStandardPom( null ) );
+ }
+
+}
Propchange: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/util/ReleaseUtilTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/util/ReleaseUtilTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision