svn commit: r1036585 - in /maven/maven-3/trunk/maven-core/src: main/java/org/apache/maven/execution/ test/java/org/apache/maven/execution/

[bentmann]

Author: bentmann
Date: Thu Nov 18 19:28:53 2010
New Revision: 1036585

URL: http://svn.apache.org/viewvc?rev=1036585&view=rev
Log:
[MNG-4904] Make MavenExecutionResult.getTopologicallySortedProjects() return 
empty list instead of null
Submitted by: Basil James Whitehouse III

Modified:
    
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionResult.java
    
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionResult.java
    
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionTest.java

Modified: 
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionResult.java
URL: 
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionResult.java?rev=1036585&r1=1036584&r2=1036585&view=diff
==============================================================================
--- 
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionResult.java
 (original)
+++ 
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionResult.java
 Thu Nov 18 19:28:53 2010
@@ -63,7 +63,7 @@ public class DefaultMavenExecutionResult
 
     public List<MavenProject> getTopologicallySortedProjects()
     {
-        return topologicallySortedProjects;
+        return null == topologicallySortedProjects ? 
Collections.<MavenProject> emptyList() : topologicallySortedProjects;
     }
 
     public DependencyResolutionResult getDependencyResolutionResult()

Modified: 
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionResult.java
URL: 
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionResult.java?rev=1036585&r1=1036584&r2=1036585&view=diff
==============================================================================
--- 
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionResult.java
 (original)
+++ 
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionResult.java
 Thu Nov 18 19:28:53 2010
@@ -33,6 +33,10 @@ public interface MavenExecutionResult
     MavenProject getProject();
 
     MavenExecutionResult setTopologicallySortedProjects( List<MavenProject> 
projects );
+    
+    /**
+     * @return the sorted list, or an empty list if there are no projects.
+     */
     List<MavenProject> getTopologicallySortedProjects();
 
     MavenExecutionResult setDependencyResolutionResult( 
DependencyResolutionResult result );

Modified: 
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionTest.java
URL: 
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionTest.java?rev=1036585&r1=1036584&r2=1036585&view=diff
==============================================================================
--- 
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionTest.java
 (original)
+++ 
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionTest.java
 Thu Nov 18 19:28:53 2010
@@ -19,6 +19,10 @@ package org.apache.maven.execution;
  * under the License.
  */
 
+import org.apache.maven.project.MavenProject;
+
+import java.util.List;
+
 import junit.framework.TestCase;
 
 /**
@@ -35,5 +39,14 @@ public class DefaultMavenExecutionTest
         assertNotNull( copy );
         assertNotSame( copy, original );
     }
+    
+    public void testResultWithNullTopologicallySortedProjectsIsEmptyList()
+    {
+        MavenExecutionResult result = new DefaultMavenExecutionResult();
+        result.setTopologicallySortedProjects( null );
+        List<MavenProject> projects = result.getTopologicallySortedProjects();
+        assertNotNull( projects );
+        assertTrue( projects.isEmpty() );
+    }
 
 }