Author: samindaw
Date: Thu Sep 12 10:24:19 2013
New Revision: 1522514
URL: http://svn.apache.org/r1522514
Log:
additional registry service completed validations
Modified:
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java
airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/RegistryService.java
Modified:
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java?rev=1522514&r1=1522513&r2=1522514&view=diff
==============================================================================
---
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java
(original)
+++
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java
Thu Sep 12 10:24:19 2013
@@ -164,9 +164,13 @@ public class AiravataJPARegistry extends
try {
tries++;
registryVersion =
getConfiguration("registry.version").toString();
- if
(System.getProperty("registry.initialized")==null){
+ if
(System.getProperty("registry.initialize.state")==null){
//lets wait a few seconds for the
initialization to complete
- Thread.sleep(CONNECT_FAIL_WAIT_TIME*3);
+ Thread.sleep(CONNECT_FAIL_WAIT_TIME*5);
+ } else {
+
while(System.getProperty("registry.initialize.state").equals("0")){
+
Thread.sleep(CONNECT_FAIL_WAIT_TIME);
+ }
}
break;
} catch (Exception e) {
Modified:
airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/RegistryService.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/RegistryService.java?rev=1522514&r1=1522513&r2=1522514&view=diff
==============================================================================
---
airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/RegistryService.java
(original)
+++
airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/RegistryService.java
Thu Sep 12 10:24:19 2013
@@ -93,7 +93,7 @@ public class RegistryService implements
}
private void initializeDB() {
-
+ System.setProperty("registry.initialize.state", "0");
String jdbcUrl = null;
String jdbcDriver = null;
try{
@@ -150,7 +150,7 @@ public class RegistryService implements
e.printStackTrace(); //To change body of catch statement use
File | Settings | File Templates.
}
}
- System.setProperty("registry.initialized", "1");
+ System.setProperty("registry.initialize.state", "1");
}
public boolean isRegistryServiceStarted() {
