fix some merge problems
diff --git a/genomix/pom.xml b/genomix/pom.xml
index ea35b3e..7876c8e 100644
--- a/genomix/pom.xml
+++ b/genomix/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>edu.uci.ics.hyracks</groupId>
<artifactId>genomix</artifactId>
- <version>0.2.5-SNAPSHOT</version>
+ <version>0.2.6-SNAPSHOT</version>
<packaging>pom</packaging>
<name>genomix</name>
diff --git a/pom.xml b/pom.xml
index 1c20cc8..e63a751 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,8 +26,8 @@
</build>
<scm>
- <connection>scm:git:https://vinayakb@code.google.com/p/hyracks/</connection>
- <developerConnection>scm:git:https://vinayakb@code.google.com/p/hyracks/</developerConnection>
+ <connection>scm:git:https://code.google.com/p/hyracks/</connection>
+ <developerConnection>scm:git:https://code.google.com/p/hyracks/</developerConnection>
<url>https://code.google.com/p/hyracks/source/browse/</url>
</scm>
diff --git a/pregelix/pregelix-core/src/main/java/edu/uci/ics/pregelix/core/driver/Driver.java b/pregelix/pregelix-core/src/main/java/edu/uci/ics/pregelix/core/driver/Driver.java
index 3a344d9..1f071bf 100644
--- a/pregelix/pregelix-core/src/main/java/edu/uci/ics/pregelix/core/driver/Driver.java
+++ b/pregelix/pregelix-core/src/main/java/edu/uci/ics/pregelix/core/driver/Driver.java
@@ -147,16 +147,6 @@
hcc.unDeployBinary(deploymentId);
LOG.info("job finished");
} catch (Exception e) {
- try {
- /**
- * destroy application if there is any exception
- */
- if (hcc != null && deploymentId == null) {
- hcc.unDeployBinary(deploymentId);
- }
- } catch (Exception e2) {
- throw new HyracksException(e2);
- }
throw new HyracksException(e);
}
}