Author: brett
Date: Thu May 24 03:00:32 2007
New Revision: 541251

URL: http://svn.apache.org/viewvc?view=rev&rev=541251
Log:
merge -r519505:541248 from surefire-2.3.x branch

Modified:
    
maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
    
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/XMLReporter.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?view=diff&rev=541251&r1=541250&r2=541251
==============================================================================
--- 
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
 Thu May 24 03:00:32 2007
@@ -378,7 +378,7 @@
      * forking. Prevents problems with JDKs which implement the service 
provider lookup mechanism by using
      * the system's classloader.
      *
-     * @parameter expression="${surefire.useSystemClassLoader}" 
default-value="false"
+     * @parameter expression="${surefire.useSystemClassLoader}" 
default-value="true"
      */
     private boolean useSystemClassLoader;
 

Modified: 
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/XMLReporter.java
URL: 
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/XMLReporter.java?view=diff&rev=541251&r1=541250&r2=541251
==============================================================================
--- 
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/XMLReporter.java
 (original)
+++ 
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/XMLReporter.java
 Thu May 24 03:00:32 2007
@@ -197,7 +197,10 @@
             {
                 element.setAttribute( "message", escapeAttribute( message ) );
 
-                element.setAttribute( "type", stackTrace.substring( 0, 
stackTrace.indexOf( ":" ) ) );
+                element.setAttribute( "type", ( stackTrace.indexOf( ":" ) > -1 
? stackTrace.substring( 0,
+                                                                               
                        stackTrace.indexOf(
+                                                                               
                            ":" ) )
+                    : stackTrace ) );
             }
             else
             {


Reply via email to