Fix JENKINS-16269

jenkinsci · Jan 7, 2013 · 7bdb213 · 7bdb213
1 parent 0b73ae4
commit 7bdb213
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/src/main/java/hudson/plugins/emailext/plugins/content/BuildLogRegexContent.java b/src/main/java/hudson/plugins/emailext/plugins/content/BuildLogRegexContent.java
@@ -95,6 +95,10 @@ public class BuildLogRegexContent implements EmailContent {
 
     private static final boolean ADD_NEWLINE_DEFAULT_VALUE = true;
 
+    private static final String NO_MATCH_DEFAULT_ARG_NAME = "defaultValue";
+
+    private static final String NO_MATCH_DEFAULT_VALUE = "";
+
     public String getToken() {
         return TOKEN;
     }
@@ -252,6 +256,9 @@ String getContent(BufferedReader reader, Map<String, ?> args)
         final boolean addNewline = Args.get(args, 
                 ADD_NEWLINE_ARG_NAME, 
                 ADD_NEWLINE_DEFAULT_VALUE);
+        final String defaultValue = Args.get(args,
+                NO_MATCH_DEFAULT_ARG_NAME,
+                NO_MATCH_DEFAULT_VALUE);
 
         final Pattern pattern = Pattern.compile(regex);
         final StringBuffer buffer = new StringBuffer();
@@ -338,6 +345,8 @@ String getContent(BufferedReader reader, Map<String, ?> args)
             }
         }
         insidePre = stopPre(buffer, insidePre);
+        if(buffer.length() == 0)
+            return defaultValue;
         return buffer.toString();
     }
 

diff --git a/src/test/java/hudson/plugins/emailext/plugins/content/BuildLogRegexContentTest.java b/src/test/java/hudson/plugins/emailext/plugins/content/BuildLogRegexContentTest.java
@@ -241,4 +241,21 @@ public void testGetContent_addNewLineFalse()
 
         assertEquals( "Firefox 15.0a2", result);
     }
+
+    @Test
+    public void testGetContent_defaultValue()
+            throws Exception
+    {
+        // See JENKINS-16269
+        args.put( "defaultValue", "JENKINS" );
+        args.put( "regex", "^\\*{3} Blah Blah: (.*)$" );
+        args.put( "maxMatches", 1);
+        args.put( "showTruncatedLines", false );
+        args.put( "substText", "$1" );
+        final BufferedReader reader = new BufferedReader(
+                new StringReader( "*** Application: Firefox 15.0a2\n*** Platform: Mac OS X 10.7.4 64bit" ));
+        final String result = buildLogRegexContent.getContent( reader, args );
+
+        assertEquals( "JENKINS", result );   
+    }
 }