svn commit: r1480433 - in /maven/shared/trunk/maven-project-utils/src: main/java/org/apache/maven/shared/project/utils/ProjectUtils.java test/java/org/apache/maven/shared/project/utils/ProjectUtilsTest.java

[rf...@apache.org]

Author: rfscholte
Date: Wed May  8 20:05:22 2013
New Revision: 1480433

URL: http://svn.apache.org/r1480433
Log:
Make getRootProject() null-safe

Added:
    maven/shared/trunk/maven-project-utils/src/test/java/org/apache/maven/shared/project/utils/ProjectUtilsTest.java
Modified:
    maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/utils/ProjectUtils.java

Modified: maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/utils/ProjectUtils.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/utils/ProjectUtils.java?rev=1480433&r1=1480432&r2=1480433&view=diff
==============================================================================
--- maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/utils/ProjectUtils.java (original)
+++ maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/utils/ProjectUtils.java Wed May  8 20:05:22 2013
@@ -74,6 +74,11 @@ public final class ProjectUtils
 
     public static MavenProject getRootProject( MavenProject project )
     {
+        if ( project == null )
+        {
+            return null;
+        }
+        
         MavenProject current = project;
 
         while ( !isRootProject( current ) )

Added: maven/shared/trunk/maven-project-utils/src/test/java/org/apache/maven/shared/project/utils/ProjectUtilsTest.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-project-utils/src/test/java/org/apache/maven/shared/project/utils/ProjectUtilsTest.java?rev=1480433&view=auto
==============================================================================
--- maven/shared/trunk/maven-project-utils/src/test/java/org/apache/maven/shared/project/utils/ProjectUtilsTest.java (added)
+++ maven/shared/trunk/maven-project-utils/src/test/java/org/apache/maven/shared/project/utils/ProjectUtilsTest.java Wed May  8 20:05:22 2013
@@ -0,0 +1,35 @@
+package org.apache.maven.shared.project.utils;
+
+import static org.junit.Assert.assertNull;
+
+import org.junit.Test;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+public class ProjectUtilsTest
+{
+
+    @Test
+    public void getRootProjectForNull()
+    {
+        assertNull( ProjectUtils.getRootProject( null ) );
+    }
+
+}