You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@maven.apache.org by jd...@apache.org on 2012/01/24 20:04:10 UTC

svn commit: r1235414 - /maven/surefire/trunk/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/FilterFactory.java

Author: jdcasey
Date: Tue Jan 24 19:04:10 2012
New Revision: 1235414

URL: http://svn.apache.org/viewvc?rev=1235414&view=rev
Log:
[SUREFIRE-809] fixing NPE

Modified:
    maven/surefire/trunk/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/FilterFactory.java

Modified: maven/surefire/trunk/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/FilterFactory.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/FilterFactory.java?rev=1235414&r1=1235413&r2=1235414&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/FilterFactory.java (original)
+++ maven/surefire/trunk/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/FilterFactory.java Tue Jan 24 19:04:10 2012
@@ -59,8 +59,15 @@ public class FilterFactory
         GroupMatcher included = commaSeparatedListToFilters( groups );
         GroupMatcher excluded = commaSeparatedListToFilters( excludedGroups );
 
-        included.loadGroupClasses( testClassLoader );
-        excluded.loadGroupClasses( testClassLoader );
+        if ( included != null && testClassLoader != null )
+        {
+            included.loadGroupClasses( testClassLoader );
+        }
+
+        if ( excluded != null && testClassLoader != null )
+        {
+            excluded.loadGroupClasses( testClassLoader );
+        }
 
         return new GroupMatcherCategoryFilter( included, excluded );
     }