svn commit: r605713 - /maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java

[dfabulich]

Author: dfabulich
Date: Wed Dec 19 13:42:50 2007
New Revision: 605713

URL: http://svn.apache.org/viewvc?rev=605713&view=rev
Log:
[SUREFIRE-412] Only warn about useSystemClassLoader + forkMode=never when 
useSystemClassLoader is explicitly set.

Modified:
    
maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java

Modified: 
maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
URL: 
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java?rev=605713&r1=605712&r2=605713&view=diff
==============================================================================
--- 
maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
 (original)
+++ 
maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
 Wed Dec 19 13:42:50 2007
@@ -440,11 +440,11 @@
     /**
      * Option to pass dependencies to the system's classloader instead of 
using an isolated class loader when forking.
      * Prevents problems with JDKs which implement the service provider lookup 
mechanism by using the system's
-     * classloader.
+     * classloader.  Default value is "true".
      * 
-     * @parameter expression="${surefire.useSystemClassLoader}" 
default-value="true"
+     * @parameter expression="${surefire.useSystemClassLoader}"
      */
-    private boolean useSystemClassLoader;
+    private Boolean useSystemClassLoader;
 
     /**
      * By default, Surefire enables JVM assertions for the execution of your 
test cases. To disable the assertions, set
@@ -528,9 +528,9 @@
             return false;
         }
 
-        if ( useSystemClassLoader && ForkConfiguration.FORK_NEVER.equals( 
forkMode ) )
+        if ( useSystemClassLoader != null && 
ForkConfiguration.FORK_NEVER.equals( forkMode ) )
         {
-            getLog().warn( "useSystemClassloader=true setting has no effect 
when not forking" );
+            getLog().warn( "useSystemClassloader setting has no effect when 
not forking" );
         }
 
         return true;
@@ -794,7 +794,8 @@
 
         if ( fork.isForking() )
         {
-            fork.setUseSystemClassLoader( useSystemClassLoader );
+            useSystemClassLoader = useSystemClassLoader == null ? Boolean.TRUE 
: useSystemClassLoader;
+            fork.setUseSystemClassLoader( useSystemClassLoader.booleanValue() 
);
 
             fork.setSystemProperties( systemProperties );