You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ag...@apache.org on 2014/10/26 13:16:39 UTC

git commit: [SUREFIRE-1090] Fixed NullPointerException on SmartStackTraceParser init occurring when Thread.contextClassLoader is null

Repository: maven-surefire
Updated Branches:
  refs/heads/master 604147c54 -> 391bab043


[SUREFIRE-1090] Fixed NullPointerException on SmartStackTraceParser init occurring when Thread.contextClassLoader is null


Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/391bab04
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/391bab04
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/391bab04

Branch: refs/heads/master
Commit: 391bab043eb5d807fe586455137554c4b89c988a
Parents: 604147c
Author: Jacobus2k <ja...@gmail.com>
Authored: Mon Aug 18 12:30:26 2014 +0200
Committer: Andreas Gudian <ag...@apache.org>
Committed: Sun Oct 26 13:16:08 2014 +0100

----------------------------------------------------------------------
 .../org/apache/maven/surefire/report/SmartStackTraceParser.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/391bab04/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java
----------------------------------------------------------------------
diff --git a/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java b/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java
index c97246c..c0f1128 100644
--- a/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java
+++ b/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java
@@ -66,7 +66,8 @@ public class SmartStackTraceParser
     {
         try
         {
-            return Thread.currentThread().getContextClassLoader().loadClass( name );
+            ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+            return classLoader != null ? classLoader.loadClass( name ) : null;
         }
         catch ( ClassNotFoundException e )
         {