You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by re...@apache.org on 2015/06/23 15:57:46 UTC
[1/2] stratos git commit: fix for get runtime issue
Repository: stratos
Updated Branches:
refs/heads/master 7bc7b4dd4 -> bb6e10298
fix for get runtime issue
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/68caf7fa
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/68caf7fa
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/68caf7fa
Branch: refs/heads/master
Commit: 68caf7fa6b345a66530ffcbc41854fce36b0f9fc
Parents: 7bc7b4d
Author: reka <rt...@gmail.com>
Authored: Tue Jun 23 19:16:08 2015 +0530
Committer: reka <rt...@gmail.com>
Committed: Tue Jun 23 19:16:08 2015 +0530
----------------------------------------------------------------------
.../stratos/rest/endpoint/api/StratosApiV41Utils.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/68caf7fa/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
index 890cecb..2211ef3 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
@@ -1905,11 +1905,11 @@ public class StratosApiV41Utils {
if (application == null) {
return null;
}
- }
- applicationBean = ObjectConverter.convertApplicationToApplicationInstanceBean(application);
- for (ApplicationInstanceBean instanceBean : applicationBean.getApplicationInstances()) {
- addClustersInstancesToApplicationInstanceBean(instanceBean, application);
- addGroupsInstancesToApplicationInstanceBean(instanceBean, application);
+ applicationBean = ObjectConverter.convertApplicationToApplicationInstanceBean(application);
+ for (ApplicationInstanceBean instanceBean : applicationBean.getApplicationInstances()) {
+ addClustersInstancesToApplicationInstanceBean(instanceBean, application);
+ addGroupsInstancesToApplicationInstanceBean(instanceBean, application);
+ }
}
} finally {
ApplicationManager.releaseReadLockForApplication(applicationId);
[2/2] stratos git commit: persisting the application upon termination
of an instance
Posted by re...@apache.org.
persisting the application upon termination of an instance
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/bb6e1029
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/bb6e1029
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/bb6e1029
Branch: refs/heads/master
Commit: bb6e102986ad8e54556d9f6de47cc6eaa077e775
Parents: 68caf7f
Author: reka <rt...@gmail.com>
Authored: Tue Jun 23 19:22:04 2015 +0530
Committer: reka <rt...@gmail.com>
Committed: Tue Jun 23 19:22:04 2015 +0530
----------------------------------------------------------------------
.../stratos/autoscaler/applications/topic/ApplicationBuilder.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/bb6e1029/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationBuilder.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationBuilder.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationBuilder.java
index 585782c..1aafd00 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationBuilder.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationBuilder.java
@@ -285,6 +285,7 @@ public class ApplicationBuilder {
networkPartitionContext.removeInstanceContext(instanceId);
applicationMonitor.removeInstance(instanceId);
application.removeInstance(instanceId);
+ ApplicationHolder.persistApplication(application);
ApplicationsEventPublisher.sendApplicationInstanceTerminatedEvent(applicationId,
instanceId);