Fix JENKINS-27448

Remove check for output != null.
jenkinsci · Apr 8, 2015 · 27fbded · 27fbded
1 parent 8b78212
commit 27fbded
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 7 deletions.
diff --git a/src/main/java/hudson/plugins/emailext/ExtendedEmailPublisher.java b/src/main/java/hudson/plugins/emailext/ExtendedEmailPublisher.java
@@ -478,12 +478,9 @@ private boolean executePresendScript(ExtendedEmailPublisherContext context, Mime
             }
 
             try {
-                Object output = shell.evaluate(script);
-                if (output != null) {
-                    pw.println("Result: " + output);
-                    cancel = ((Boolean) shell.getVariable("cancel"));
-                    debug(context.getListener().getLogger(), "Pre-send script set cancel to %b", cancel);
-                }
+                shell.evaluate(script);
+                cancel = ((Boolean) shell.getVariable("cancel"));
+                debug(context.getListener().getLogger(), "Pre-send script set cancel to %b", cancel);
             } catch (SecurityException e) {
                 context.getListener().getLogger().println("Pre-send script tried to access secured objects: " + e.getMessage());
             } catch (Throwable t) {

diff --git a/src/test/java/hudson/plugins/emailext/ExtendedEmailPublisherTest.java b/src/test/java/hudson/plugins/emailext/ExtendedEmailPublisherTest.java
@@ -60,7 +60,6 @@
 import org.jvnet.hudson.test.JenkinsRule.WebClient;
 import org.jvnet.hudson.test.MockBuilder;
 import org.jvnet.hudson.test.SleepBuilder;
-import org.jvnet.hudson.test.recipes.WithPlugin;
 import org.jvnet.mock_javamail.Mailbox;
 import org.kohsuke.stapler.Stapler;
 
@@ -535,6 +534,32 @@ public void testCancelFromPresendScriptCausesNoEmail() throws Exception {
 
         assertEquals(0, Mailbox.get("kutzi@xxx.com").size());
     }
+
+    @Test
+    @Issue("JENKINS-27448")
+    public void testCancelFromPresendScriptCausesNoEmailWithCodeAfter() throws Exception {
+        publisher.presendScript = "cancel = true\nlogger.println('You are here')";
+        SuccessTrigger successTrigger = new SuccessTrigger(recProviders, "$DEFAULT_RECIPIENTS",
+                "$DEFAULT_REPLYTO", "$DEFAULT_SUBJECT", "$DEFAULT_CONTENT", "", 0, "project");
+        successTrigger.setEmail(new EmailType() {
+            {
+                addRecipientProvider(new RequesterRecipientProvider());
+            }
+        });
+        publisher.getConfiguredTriggers().add(successTrigger);
+
+        User u = User.get("kutzi");
+        u.setFullName("Christoph Kutzinski");
+        Mailer.UserProperty prop = new Mailer.UserProperty("kutzi@xxx.com");
+        u.addProperty(prop);
+
+        UserCause cause = new MockUserCause("kutzi");
+
+        FreeStyleBuild build = project.scheduleBuild2(0, cause).get();
+        j.assertBuildStatusSuccess(build);
+
+        assertEquals(0, Mailbox.get("kutzi@xxx.com").size());
+    }
 
     @Test
     @Issue("JENKINS-22777")