FORGE-979 Fixed Forge plugin installation failures on Windows.

The fix was to close the Git repository before deleting the directory housing it.
forge · Jun 28, 2013 · ef14731 · ef14731
1 parent d929cef
commit ef14731
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/git-tools/src/main/java/org/jboss/forge/git/GitUtils.java b/git-tools/src/main/java/org/jboss/forge/git/GitUtils.java
@@ -372,8 +372,17 @@ public static Ref createBranch(Git git, String branchName) throws RefAlreadyExis
       return newBranch;
    }
 
+   /**
+    * Closes a Git repository.
+    * Invoke this before deleting the Git repository on Windows to prevent errors due to unclosed file handles.  
+    * 
+    * @param repo The repository to close.
+    */
    public static void close(final Git repo)
    {
-      repo.getRepository().close();
+      if (repo != null)
+      {
+         repo.getRepository().close();
+      }
    }
 }
diff --git a/shell/src/main/java/org/jboss/forge/shell/plugins/builtin/ForgePlugin.java b/shell/src/main/java/org/jboss/forge/shell/plugins/builtin/ForgePlugin.java
@@ -307,11 +307,12 @@ public void installFromGit(
          buildDir = shell.getCurrentDirectory().createTempResource();
       }
 
+      Git repo = null;
       try
       {
          ShellMessages.info(out, "Checking out plugin source files to [" + buildDir.getFullyQualifiedName()
                   + "] via 'git'");
-         Git repo = GitUtils.clone(buildDir, gitRepo);
+         repo = GitUtils.clone(buildDir, gitRepo);
 
          Ref ref = null;
          String targetRef = refName;
@@ -414,6 +415,7 @@ else if (refName != null)
       }
       finally
       {
+         GitUtils.close(repo);
          if (buildDir != null)
          {
             if (keepSources)