From bcce421513e014d8913e7e56eb4c70d81ab8add3 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 20 Jun 2013 14:20:41 -0700 Subject: [PATCH] Fixed NPE with @WithoutJenkins --- .../src/main/java/org/jvnet/hudson/test/HudsonTestCase.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java b/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java index 013ec8574e..db7701ae7d 100644 --- a/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java +++ b/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java @@ -381,8 +381,10 @@ public abstract class HudsonTestCase extends TestCase implements RootAction { @Override protected void tearDown() throws Exception { try { - for (EndOfTestListener tl : jenkins.getExtensionList(EndOfTestListener.class)) - tl.onTearDown(); + if (jenkins!=null) { + for (EndOfTestListener tl : jenkins.getExtensionList(EndOfTestListener.class)) + tl.onTearDown(); + } if (timeoutTimer!=null) { timeoutTimer.cancel();