Fixed some minor bugs in GIT addon

forge · Apr 4, 2014 · 76578b7 · 76578b7
1 parent 9aa8c11
commit 76578b7
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 8 deletions.
diff --git a/git/impl/src/main/java/org/jboss/forge/addon/git/GitUtilsImpl.java b/git/impl/src/main/java/org/jboss/forge/addon/git/GitUtilsImpl.java
@@ -58,7 +58,7 @@
  */
 public class GitUtilsImpl implements GitUtils
 {
-   
+
    @Override
    public Git clone(final DirectoryResource dir, final String repoUri) throws GitAPIException
    {
@@ -89,7 +89,7 @@ public Ref checkout(final Git git, final String remote, final boolean createBran
    }
 
    @Override
-   public Ref checkout(final Git git, final Ref localRef, final SetupUpstreamMode mode, 
+   public Ref checkout(final Git git, final Ref localRef, final SetupUpstreamMode mode,
             final boolean force) throws GitAPIException
    {
       CheckoutCommand checkout = git.checkout();
@@ -390,6 +390,9 @@ public Ref createBranch(Git git, String branchName) throws GitAPIException
    @Override
    public void close(final Git repo)
    {
-      repo.getRepository().close();
+      if (repo != null)
+      {
+         repo.getRepository().close();
+      }
    }
 }
diff --git a/git/impl/src/main/java/org/jboss/forge/addon/git/ui/GitCloneCommand.java b/git/impl/src/main/java/org/jboss/forge/addon/git/ui/GitCloneCommand.java
@@ -26,7 +26,7 @@
 /**
  * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
  * @author <a href="mailto:jevgeni.zelenkov@gmail.com">Jevgeni Zelenkov</a>
- * 
+ *
  */
 public class GitCloneCommand extends AbstractGitCommand
 {
@@ -63,8 +63,15 @@ public Result execute(UIExecutionContext context) throws Exception
       {
          cloneFolder.mkdirs();
       }
-      Git clone = gitUtils.clone(cloneFolder, uri.getValue());
-      gitUtils.close(clone);
+      Git clone = null;
+      try
+      {
+         clone = gitUtils.clone(cloneFolder, uri.getValue());
+      }
+      finally
+      {
+         gitUtils.close(clone);
+      }
       context.getUIContext().setSelection(cloneFolder);
       return Results.success();
    }
@@ -73,9 +80,10 @@ public Result execute(UIExecutionContext context) throws Exception
    public void validate(UIValidationContext validator)
    {
       DirectoryResource folder = targetDirectory.getValue();
-      if (folder.exists() && (!folder.isDirectory() || !folder.listResources().isEmpty()))
+      if (folder == null || (folder.exists() && (!folder.isDirectory() || !folder.listResources().isEmpty())))
       {
-         validator.addValidationError(targetDirectory, "The specified target directory should not exist or should be empty directory");
+         validator.addValidationError(targetDirectory,
+                  "The specified target directory should not exist or should be empty directory");
       }
    }