Merge pull request #1591 from vb-linetco/patch-1

[FIXED JENKINS-27441] avoid IOOBE in getLog when called with 0

core/src/main/java/hudson/model/Run.java

@@ -1933,6 +1933,9 @@ public abstract class Run <JobT extends Job<JobT,RunT>,RunT extends Run<JobT,Run
     public @Nonnull List<String> getLog(int maxLines) throws IOException {
         int lineCount = 0;
         List<String> logLines = new LinkedList<String>();
+        if (maxLines == 0) {
+            return logLines;
+        }
         BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(getLogFile()),getCharset()));
         try {
             for (String line = reader.readLine(); line != null; line = reader.readLine()) {

core/src/test/java/hudson/model/RunTest.java

@@ -25,6 +25,9 @@
 package hudson.model;
 
 import java.io.IOException;
+import hudson.model.Run.Artifact;
+import java.io.File;
+import java.io.PrintWriter;
 import java.util.List;
 import java.util.TimeZone;
 import java.util.concurrent.Callable;
@@ -32,11 +35,17 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
 import static org.junit.Assert.*;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
 import org.jvnet.hudson.test.Issue;
+import org.mockito.Mockito;
+
 
 public class RunTest {
 
+    @Rule public TemporaryFolder tmp = new TemporaryFolder();
+
     @Issue("JENKINS-15816")
     @SuppressWarnings({"unchecked", "rawtypes"})
     @Test public void timezoneOfID() throws Exception {
@@ -128,4 +137,21 @@ public class RunTest {
         msg = r.getDurationString();
         assertFalse(msg, msg.endsWith(" and counting"));
     }
+
+    @Issue("JENKINS-27441")
+    @Test
+    public void getLogReturnsAnEmptyListWhenCalledWith0() throws Exception {
+        Job j = Mockito.mock(Job.class);
+        File tempBuildDir = tmp.newFolder();
+        Mockito.when(j.getBuildDir()).thenReturn(tempBuildDir);
+        Run r = new Run(j, 0) {};
+        File f = r.getLogFile();
+        f.getParentFile().mkdirs();
+        PrintWriter w = new PrintWriter(f, "utf-8");
+        w.println("dummy");
+        w.close();
+        List<String> logLines = r.getLog(0);
+        assertTrue(logLines.isEmpty());
+    }
+
 }