Repository: stratos Updated Branches: refs/heads/master fc95e5bfc -> e1876b040
fixing instance creation issue becuase of NULL check Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/e1876b04 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/e1876b04 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/e1876b04 Branch: refs/heads/master Commit: e1876b040863777057067947719b315b9b05af81 Parents: fc95e5b Author: reka <[email protected]> Authored: Thu Jul 2 14:51:15 2015 +0530 Committer: reka <[email protected]> Committed: Thu Jul 2 14:51:15 2015 +0530 ---------------------------------------------------------------------- .../autoscaler/monitor/component/ParentComponentMonitor.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/e1876b04/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ParentComponentMonitor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ParentComponentMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ParentComponentMonitor.java index 588b49f..ef61fa2 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ParentComponentMonitor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ParentComponentMonitor.java @@ -244,11 +244,13 @@ public abstract class ParentComponentMonitor extends Monitor { Monitor monitor = aliasToActiveChildMonitorsMap.get(context.getId()); // Creating new instance for (String instanceId : parentInstanceIds) { - if(monitor.getInstancesByParentInstanceId(instanceId) == null) { + if(monitor.getInstancesByParentInstanceId(instanceId) == null || + monitor.getInstancesByParentInstanceId(instanceId).isEmpty()) { monitor.createInstanceOnDemand(instanceId); } else { log.info(String.format("Instance has already exists for [application] " + - "%s [component] %s", getAppId(), context.getId())); + "%s [component] %s [instance-id] %s", getAppId(), + context.getId(), instanceId)); } } }
