Merge pull request #185 from MarkEWaite/JENKINS-19994-close-changelog…

…-opened-files [JENKINS-19994] Close files opened by computeChangeLog, use abort()
jenkinsci · Jan 6, 2014 · d267bd6 · d267bd6
2 parents 5ac9acd + 2faba2a
commit d267bd6
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/main/java/hudson/plugins/git/GitSCM.java b/src/main/java/hudson/plugins/git/GitSCM.java
@@ -938,6 +938,7 @@ public boolean checkout(AbstractBuild build, Launcher launcher, FilePath workspa
     private void computeChangeLog(GitClient git, Revision revToBuild, BuildListener listener, BuildData previousBuildData, FilePath changelogFile, BuildChooserContext context) throws IOException, InterruptedException {
         Writer out = new OutputStreamWriter(changelogFile.write(),"UTF-8");
 
+        boolean executed = false;
         ChangelogCommand changelog = git.changelog();
         changelog.includes(revToBuild.getSha1());
         try {
@@ -955,10 +956,12 @@ private void computeChangeLog(GitClient git, Revision revToBuild, BuildListener
                 listener.getLogger().println("First time build. Skipping changelog.");
             } else {
                 changelog.to(out).max(MAX_CHANGELOG).execute();
+                executed = true;
             }
         } catch (GitException ge) {
             ge.printStackTrace(listener.error("Unable to retrieve changeset"));
         } finally {
+            if (!executed) changelog.abort();
             IOUtils.closeQuietly(out);
         }
     }