Repository: stratos Updated Branches: refs/heads/4.0.0-grouping 6435221ff -> 855039889
adding a null check in ParentComponentMonitor#onChildTerminatingEvent Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/85503988 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/85503988 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/85503988 Branch: refs/heads/4.0.0-grouping Commit: 85503988938a305d681189c671799b19d0947ad6 Parents: 6435221 Author: Isuru Haththotuwa <[email protected]> Authored: Wed Oct 22 17:40:32 2014 +0530 Committer: Isuru Haththotuwa <[email protected]> Committed: Wed Oct 22 17:40:32 2014 +0530 ---------------------------------------------------------------------- .../autoscaler/monitor/ParentComponentMonitor.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/85503988/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/ParentComponentMonitor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/ParentComponentMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/ParentComponentMonitor.java index f2965fa..14ce281 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/ParentComponentMonitor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/ParentComponentMonitor.java @@ -95,13 +95,17 @@ public abstract class ParentComponentMonitor extends Monitor { } Monitor monitor = this.aliasToInActiveMonitorsMap.get(idOfEvent); - for (Monitor monitor1 : monitor.getAliasToActiveMonitorsMap().values()) { - if (monitor.hasMonitors()) { - StatusEventPublisher.sendGroupTerminatingEvent(this.appId, monitor1.getId()); - } else { - StatusEventPublisher.sendClusterTerminatingEvent(this.appId, - ((AbstractClusterMonitor) monitor1).getServiceId(), monitor.getId()); + if (monitor != null) { + for (Monitor monitor1 : monitor.getAliasToActiveMonitorsMap().values()) { + if (monitor.hasMonitors()) { + StatusEventPublisher.sendGroupTerminatingEvent(this.appId, monitor1.getId()); + } else { + StatusEventPublisher.sendClusterTerminatingEvent(this.appId, + ((AbstractClusterMonitor) monitor1).getServiceId(), monitor.getId()); + } } + } else { + log.warn("Active Monitor not found for the id " + idOfEvent); } }
