From 255d27cc4ac1ef7f01b06eba7051ff61e52841d1 Mon Sep 17 00:00:00 2001
From: Matthew York <my3681@gmail.com>
Date: Tue, 25 Nov 2014 15:20:21 -0800
Subject: [PATCH] - Fixed bug of some Git calls not getting closed which caused
 irregularities in gear management

---
 AndroidGears/.idea/misc.xml                     | 5 ++---
 AndroidGears/AndroidGears.iml                   | 5 ++---
 AndroidGears/META-INF/plugin.xml                | 2 +-
 AndroidGears/src/Utilities/GearSpecManager.java | 3 ++-
 AndroidGears/src/Workers/Git/GitWorker.java     | 6 ++++--
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/AndroidGears/.idea/misc.xml b/AndroidGears/.idea/misc.xml
index dc5e3b5..c3a276d 100644
--- a/AndroidGears/.idea/misc.xml
+++ b/AndroidGears/.idea/misc.xml
@@ -3,8 +3,7 @@
   <component name="EntryPointsManager">
     <entry_points version="2.0" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA IC-135.690" project-jdk-type="IDEA JDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA IC-139.225.3" project-jdk-type="IDEA JDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/AndroidGears/AndroidGears.iml b/AndroidGears/AndroidGears.iml
index a9c83f7..20a03ff 100644
--- a/AndroidGears/AndroidGears.iml
+++ b/AndroidGears/AndroidGears.iml
@@ -7,7 +7,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/resources" isTestSource="false" />
     </content>
-    <orderEntry type="jdk" jdkName="IDEA IC-135.480" jdkType="IDEA JDK" />
+    <orderEntry type="jdk" jdkName="IDEA IC-139.225.3" jdkType="IDEA JDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module-library" exported="">
       <library>
@@ -23,5 +23,4 @@
     <orderEntry type="library" exported="" name="commons-io-2.4" level="project" />
     <orderEntry type="library" name="gson-2.2.4" level="project" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/AndroidGears/META-INF/plugin.xml b/AndroidGears/META-INF/plugin.xml
index 7fe338a..bb23a43 100644
--- a/AndroidGears/META-INF/plugin.xml
+++ b/AndroidGears/META-INF/plugin.xml
@@ -1,7 +1,7 @@
 <idea-plugin version="2">
     <id>com.github.androidgears.plugin5</id>
     <name>Android Gears</name>
-    <version>0.4.9</version>
+    <version>0.5.1</version>
     <vendor email="myork@cs.ua.edu" url="http://www.androidgears.org">Android Gears</vendor>
 
     <description><![CDATA[
diff --git a/AndroidGears/src/Utilities/GearSpecManager.java b/AndroidGears/src/Utilities/GearSpecManager.java
index 2c8d7b8..ab74533 100644
--- a/AndroidGears/src/Utilities/GearSpecManager.java
+++ b/AndroidGears/src/Utilities/GearSpecManager.java
@@ -59,11 +59,12 @@ public static Boolean installModule(GearSpec spec, Project project, Module modul
 
         //Clone down repo
         try {
-            Git.cloneRepository()
+            Git git = Git.cloneRepository()
                     .setURI(spec.getSource().getUrl())
                     .setBranch(spec.getSource().getTag())
                     .setDirectory(specDirectory)
                     .call();
+            git.close();
         } catch (GitAPIException e) {
             e.printStackTrace();
 
diff --git a/AndroidGears/src/Workers/Git/GitWorker.java b/AndroidGears/src/Workers/Git/GitWorker.java
index 09af1e9..7c7024e 100644
--- a/AndroidGears/src/Workers/Git/GitWorker.java
+++ b/AndroidGears/src/Workers/Git/GitWorker.java
@@ -53,11 +53,13 @@ private Boolean cloneRepository(File androidGearsDirectory){
             //Get repos directory
            File reposDirectory = git.getRepository().getDirectory().getParentFile();
 
-            //Check that we cloned down correctly
+            //Close git connection!
+            git.close();
+
+            //If everything was created successfully, return true
             if (reposDirectory != null){
                 if (reposDirectory.exists()){
                     if (reposDirectory.list().length > 1){
-                        git.close();
                         return true;
                     }
                 }