[FIXED JENKINS-12188] close JGit repository

jenkinsci · Feb 28, 2013 · e86d5eb · e86d5eb
1 parent cda843e
commit e86d5eb
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/src/main/java/hudson/plugins/git/util/DefaultBuildChooser.java b/src/main/java/hudson/plugins/git/util/DefaultBuildChooser.java
@@ -4,6 +4,7 @@
 import hudson.model.TaskListener;
 import hudson.plugins.git.*;
 import org.eclipse.jgit.lib.ObjectId;
+import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.transport.RemoteConfig;
 import org.kohsuke.stapler.DataBoundConstructor;
 
@@ -218,7 +219,12 @@ private List<Revision> getAdvancedCandidateRevisions(boolean isPollCall, TaskLis
 
         // 5. sort them by the date of commit, old to new
         // this ensures the fairness in scheduling.
-        Collections.sort(revs,new CommitTimeComparator(utils.git.getRepository()));
+        Repository repository = utils.git.getRepository();
+        try {
+            Collections.sort(revs,new CommitTimeComparator(repository));
+        } finally {
+            repository.close();
+        }
 
         return revs;
     }

diff --git a/src/main/java/hudson/plugins/git/util/GitUtils.java b/src/main/java/hudson/plugins/git/util/GitUtils.java
@@ -10,6 +10,7 @@
 import hudson.plugins.git.Revision;
 import hudson.slaves.NodeProperty;
 import org.eclipse.jgit.lib.ObjectId;
+import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.revwalk.RevWalk;
 import org.eclipse.jgit.revwalk.filter.RevFilter;
 import org.jenkinsci.plugins.gitclient.GitClient;
@@ -102,13 +103,15 @@ public List<Revision> filterTipBranches(Collection<Revision> revisions) {
         ObjectId shaJ;
         ObjectId commonAncestor;
         RevWalk walk = null;
+        Repository repository = null;
         final long start = System.currentTimeMillis();
         long calls = 0;
         if (log)
             LOGGER.fine(MessageFormat.format(
                     "Computing merge base of {0}  branches", l.size()));
         try {
-            walk = new RevWalk(git.getRepository());
+            repository = git.getRepository();
+            walk = new RevWalk(repository);
             walk.setRetainBody(false);
             walk.setRevFilter(RevFilter.MERGE_BASE);
             for (int i = 0; i < l.size(); i++)
@@ -145,8 +148,8 @@ public List<Revision> filterTipBranches(Collection<Revision> revisions) {
         } catch (IOException e) {
             throw new GitException("Error computing merge base", e);
         } finally {
-            if (walk != null)
+            if (walk != null) walk.release();
-                walk.release();
+            if (repository != null) repository.close();
         }
         if (log)
             LOGGER.fine(MessageFormat.format(

diff --git a/src/main/java/hudson/plugins/git/util/InverseBuildChooser.java b/src/main/java/hudson/plugins/git/util/InverseBuildChooser.java
@@ -3,6 +3,7 @@
 import hudson.Extension;
 import hudson.model.TaskListener;
 import hudson.plugins.git.*;
+import org.eclipse.jgit.lib.Repository;
 import org.kohsuke.stapler.DataBoundConstructor;
 
 import java.io.IOException;
@@ -88,7 +89,12 @@ public Collection<Revision> getCandidateRevisions(boolean isPollCall,
         }
 
         // Sort revisions by the date of commit, old to new, to ensure fairness in scheduling
-        Collections.sort(branchRevs, new CommitTimeComparator(utils.git.getRepository()));
+        Repository repository = utils.git.getRepository();
+        try {
+            Collections.sort(branchRevs, new CommitTimeComparator(repository));
+        } finally {
+            repository.close();
+        }
         return branchRevs;
     }