From 97f1d02cbdc0aa85d2e907d878b126e80fd0880b Mon Sep 17 00:00:00 2001 From: Stephen Connolly Date: Thu, 31 Mar 2011 16:35:05 +0100 Subject: [PATCH] Tsk Tsk! Kohsuke you missed a possible NPE for people running hpi:run on plugins in fixing [JENKINS-6545] --- .../main/java/org/jvnet/hudson/test/TestExtensionLoader.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/src/main/java/org/jvnet/hudson/test/TestExtensionLoader.java b/test/src/main/java/org/jvnet/hudson/test/TestExtensionLoader.java index b95937dbde..c4a7150e0e 100644 --- a/test/src/main/java/org/jvnet/hudson/test/TestExtensionLoader.java +++ b/test/src/main/java/org/jvnet/hudson/test/TestExtensionLoader.java @@ -93,6 +93,8 @@ public class TestExtensionLoader extends ExtensionFinder { } private boolean isActive(TestEnvironment env, Class extType) { + if (env == null || env.testCase == null) + return false; for (Class outer = extType; outer!=null; outer=outer.getEnclosingClass()) if (outer.isInstance(env.testCase)) return true; // enclosed