svn commit: r1204687 - in /maven/surefire/trunk: maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ surefire-api/src/main/java/org/apache/maven/surefire/suite/ surefire-booter/src/main/java/org/apache/maven/surefire/booter/

[krosenvold]

Author: krosenvold
Date: Mon Nov 21 20:23:35 2011
New Revision: 1204687

URL: http://svn.apache.org/viewvc?rev=1204687&view=rev
Log:
o Cleaned up unused return value from forked process

Modified:
    
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
    
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/suite/RunResult.java
    
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java

Modified: 
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
URL: 
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java?rev=1204687&r1=1204686&r2=1204687&view=diff
==============================================================================
--- 
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
 (original)
+++ 
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
 Mon Nov 21 20:23:35 2011
@@ -189,7 +189,7 @@ public class ForkStarter
             final int result =
                 CommandLineUtils.executeCommandLine( cli, 
threadedStreamConsumer2, threadedStreamConsumer2, timeout );
 
-            if (result != RunResult.SUCCESS && result != RunResult.FAILURE){
+            if (result != RunResult.SUCCESS){
                 throw new SurefireBooterForkException("Error occured in 
starting fork, check output in log");
             }
             threadedStreamConsumer2.close();

Modified: 
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/suite/RunResult.java
URL: 
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/suite/RunResult.java?rev=1204687&r1=1204686&r2=1204687&view=diff
==============================================================================
--- 
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/suite/RunResult.java
 (original)
+++ 
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/suite/RunResult.java
 Mon Nov 21 20:23:35 2011
@@ -42,9 +42,9 @@ public class RunResult
 
     public static final int SUCCESS = 0;
 
-    public static final int FAILURE = 255;
+    private static final int FAILURE = 255;
 
-    public static final int NO_TESTS = 254;
+    private static final int NO_TESTS = 254;
 
     public static final RunResult Timeout = new RunResult( 0, 0, 0, 0, false, 
true );
 
@@ -83,11 +83,6 @@ public class RunResult
         return skipped;
     }
 
-    public int getBooterCode()
-    {
-        return isErrrorFree() ? SUCCESS : FAILURE;
-    }
-
     public int getForkedProcessCode()
     {
         return completedCount == 0 ? NO_TESTS : isErrrorFree() ? SUCCESS : 
FAILURE;

Modified: 
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java
URL: 
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java?rev=1204687&r1=1204686&r2=1204687&view=diff
==============================================================================
--- 
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java
 (original)
+++ 
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java
 Mon Nov 21 20:23:35 2011
@@ -70,7 +70,7 @@ public class ForkedBooter
                 : starter.runSuitesInProcessWhenForked();
 
             // noinspection CallToSystemExit
-            System.exit( result.getBooterCode() );
+            System.exit( 0 );
         }
         catch ( Throwable t )
         {