Fix Application Key regeneration issue when redeploying cartridge

apache · Feb 10, 2016 · 0a5fec3 · 0a5fec3
1 parent 5781994
commit 0a5fec3
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/...main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java b/...main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java
@@ -28,6 +28,7 @@
 import org.apache.stratos.autoscaler.applications.ClusterInformation;
 import org.apache.stratos.autoscaler.applications.MTClusterInformation;
 import org.apache.stratos.autoscaler.applications.STClusterInformation;
+import org.apache.stratos.autoscaler.applications.ApplicationHolder;
 import org.apache.stratos.autoscaler.applications.payload.PayloadData;
 import org.apache.stratos.autoscaler.applications.pojo.*;
 import org.apache.stratos.autoscaler.client.IdentityApplicationManagementServiceClient;
@@ -270,7 +271,19 @@ private Application buildCompositeAppStructure(ApplicationContext applicationCon
  Map<String, SubscribableInfoContext> subscribableInfoCtxts)
  throws ApplicationDefinitionException, CartridgeGroupNotFoundException, CartridgeNotFoundException {
 
- Application application = new Application(applicationContext.getApplicationId());
+ Application application;
+
+ // check if application already exists, and get existing key if true
+ ApplicationHolder.acquireReadLock();
+ Applications persistedApplications = ApplicationHolder.getApplications();
+ if (persistedApplications != null && persistedApplications.applicationExists(applicationContext.getApplicationId())) {
+ String existingKey = persistedApplications.getApplication(applicationContext.getApplicationId()).getKey();
+ application = new Application(applicationContext.getApplicationId(), existingKey);
+ } else {
+ application = new Application(applicationContext.getApplicationId());
+ }
+
+ ApplicationHolder.releaseReadLock();
 
  // Set tenant information
  application.setTenantId(applicationContext.getTenantId());

diff --git a/....messaging/src/main/java/org/apache/stratos/messaging/domain/application/Application.java b/....messaging/src/main/java/org/apache/stratos/messaging/domain/application/Application.java
@@ -61,6 +61,13 @@ public Application(String id) {
  this.setInstanceIdToInstanceContextMap(new HashMap<String, ApplicationInstance>());
  }
 
+ public Application(String id, String key) {
+ super();
+ this.id = id;
+ this.key = key;
+ this.setInstanceIdToInstanceContextMap(new HashMap<String, ApplicationInstance>());
+ }
+
  public String getUniqueIdentifier() {
  return id;
  }