- Fixed bug of some Git calls not getting closed which caused irregul…

…arities in gear management
AndroidGears · Nov 25, 2014 · 255d27c · 255d27c
1 parent d1b93ba
commit 255d27c
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git a/AndroidGears/.idea/misc.xml b/AndroidGears/.idea/misc.xml
diff --git 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>
diff --git 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
@@ -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
@@ -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;
                     }
                 }