Skip to content
This repository was archived by the owner on Jul 4, 2023. It is now read-only.

Commit 255d27c

Browse files
committed
- Fixed bug of some Git calls not getting closed which caused irregularities in gear management
1 parent d1b93ba commit 255d27c

File tree

5 files changed

+11
-10
lines changed

5 files changed

+11
-10
lines changed

AndroidGears/.idea/misc.xml

Lines changed: 2 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

AndroidGears/AndroidGears.iml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
88
<sourceFolder url="file://$MODULE_DIR$/resources" isTestSource="false" />
99
</content>
10-
<orderEntry type="jdk" jdkName="IDEA IC-135.480" jdkType="IDEA JDK" />
10+
<orderEntry type="jdk" jdkName="IDEA IC-139.225.3" jdkType="IDEA JDK" />
1111
<orderEntry type="sourceFolder" forTests="false" />
1212
<orderEntry type="module-library" exported="">
1313
<library>
@@ -23,5 +23,4 @@
2323
<orderEntry type="library" exported="" name="commons-io-2.4" level="project" />
2424
<orderEntry type="library" name="gson-2.2.4" level="project" />
2525
</component>
26-
</module>
27-
26+
</module>

AndroidGears/META-INF/plugin.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<idea-plugin version="2">
22
<id>com.github.androidgears.plugin5</id>
33
<name>Android Gears</name>
4-
<version>0.4.9</version>
4+
<version>0.5.1</version>
55
<vendor email="myork@cs.ua.edu" url="http://www.androidgears.org">Android Gears</vendor>
66

77
<description><![CDATA[

AndroidGears/src/Utilities/GearSpecManager.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,12 @@ public static Boolean installModule(GearSpec spec, Project project, Module modul
5959

6060
//Clone down repo
6161
try {
62-
Git.cloneRepository()
62+
Git git = Git.cloneRepository()
6363
.setURI(spec.getSource().getUrl())
6464
.setBranch(spec.getSource().getTag())
6565
.setDirectory(specDirectory)
6666
.call();
67+
git.close();
6768
} catch (GitAPIException e) {
6869
e.printStackTrace();
6970

AndroidGears/src/Workers/Git/GitWorker.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,13 @@ private Boolean cloneRepository(File androidGearsDirectory){
5353
//Get repos directory
5454
File reposDirectory = git.getRepository().getDirectory().getParentFile();
5555

56-
//Check that we cloned down correctly
56+
//Close git connection!
57+
git.close();
58+
59+
//If everything was created successfully, return true
5760
if (reposDirectory != null){
5861
if (reposDirectory.exists()){
5962
if (reposDirectory.list().length > 1){
60-
git.close();
6163
return true;
6264
}
6365
}

0 commit comments

Comments
 (0)