You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by he...@apache.org on 2012/03/01 17:44:55 UTC

svn commit: r1295666 - /incubator/airavata/trunk/modules/registry-migrator/src/main/java/org/apache/airavata/migrator/registry/XRegistryMigrate.java

Author: heshan
Date: Thu Mar  1 16:44:55 2012
New Revision: 1295666

URL: http://svn.apache.org/viewvc?rev=1295666&view=rev
Log:
Fixing concurrent modification excpetion.

Modified:
    incubator/airavata/trunk/modules/registry-migrator/src/main/java/org/apache/airavata/migrator/registry/XRegistryMigrate.java

Modified: incubator/airavata/trunk/modules/registry-migrator/src/main/java/org/apache/airavata/migrator/registry/XRegistryMigrate.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/registry-migrator/src/main/java/org/apache/airavata/migrator/registry/XRegistryMigrate.java?rev=1295666&r1=1295665&r2=1295666&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/registry-migrator/src/main/java/org/apache/airavata/migrator/registry/XRegistryMigrate.java (original)
+++ incubator/airavata/trunk/modules/registry-migrator/src/main/java/org/apache/airavata/migrator/registry/XRegistryMigrate.java Thu Mar  1 16:44:55 2012
@@ -179,7 +179,13 @@ public class XRegistryMigrate {
             if(appBean != null){
                 app = MigrationUtil.createAppDeploymentDescription(appBean);
                 try {
-                    jcrRegistry.saveDeploymentDescription(service.getType().getName(), appBean.getHostName(), app);
+                    ApplicationDeploymentDescription appDepDesc = jcrRegistry.getDeploymentDescription(service.getType().getName(), appBean.getHostName());
+                    if(appDepDesc == null) {
+                        jcrRegistry.saveDeploymentDescription(service.getType().getName(), appBean.getHostName(), app);
+                    } else {
+                        System.out.println("Application Deployment Description named " + service.getType().getName() +
+                        " with host " + appBean.getHostName() + " exists in the registry. Therefore, not saving it.");
+                    }
 //            jcrRegistry.saveDeploymentDescription(service.getType().getName(), host.getType().getHostName(), app);
                 } catch (RegistryException e) {
                     e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.