Make getRootProject() null-safe
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1480433 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/maven/shared/project/utils/ProjectUtils.java b/src/main/java/org/apache/maven/shared/project/utils/ProjectUtils.java
index 49692cc..d448b6e 100644
--- a/src/main/java/org/apache/maven/shared/project/utils/ProjectUtils.java
+++ b/src/main/java/org/apache/maven/shared/project/utils/ProjectUtils.java
@@ -74,6 +74,11 @@
public static MavenProject getRootProject( MavenProject project )
{
+ if ( project == null )
+ {
+ return null;
+ }
+
MavenProject current = project;
while ( !isRootProject( current ) )
diff --git a/src/test/java/org/apache/maven/shared/project/utils/ProjectUtilsTest.java b/src/test/java/org/apache/maven/shared/project/utils/ProjectUtilsTest.java
new file mode 100644
index 0000000..fe2da86
--- /dev/null
+++ b/src/test/java/org/apache/maven/shared/project/utils/ProjectUtilsTest.java
@@ -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 ) );
+ }
+
+}
