Avoid possible NPE in ApplicationInstance* message processors
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/7bc01c17 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/7bc01c17 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/7bc01c17 Branch: refs/heads/master Commit: 7bc01c1799a2f490d0b3292063f58374e7b08c61 Parents: 0d7ee70 Author: Chamila de Alwis <[email protected]> Authored: Wed Apr 1 05:28:28 2015 +0530 Committer: Chamila de Alwis <[email protected]> Committed: Fri Apr 3 15:05:20 2015 +0530 ---------------------------------------------------------------------- .../application/ApplicationInstanceActivatedMessageProcessor.java | 3 ++- .../ApplicationInstanceInactivatedMessageProcessor.java | 3 ++- .../ApplicationInstanceTerminatingMessageProcessor.java | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/7bc01c17/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/application/ApplicationInstanceActivatedMessageProcessor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/application/ApplicationInstanceActivatedMessageProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/application/ApplicationInstanceActivatedMessageProcessor.java index cf6da99..862ad8e 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/application/ApplicationInstanceActivatedMessageProcessor.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/application/ApplicationInstanceActivatedMessageProcessor.java @@ -93,8 +93,9 @@ public class ApplicationInstanceActivatedMessageProcessor extends MessageProcess if (log.isWarnEnabled()) { log.warn(String.format("Application instance not exists in group: [AppId] %s" + "[instanceId] %s", event.getAppId(), event.getInstanceId())); - return false; } + + return false; } ApplicationStatus status = ApplicationStatus.Active; if (!context.isStateTransitionValid(status)) { http://git-wip-us.apache.org/repos/asf/stratos/blob/7bc01c17/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/application/ApplicationInstanceInactivatedMessageProcessor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/application/ApplicationInstanceInactivatedMessageProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/application/ApplicationInstanceInactivatedMessageProcessor.java index bc680e1..3f1b56c 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/application/ApplicationInstanceInactivatedMessageProcessor.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/application/ApplicationInstanceInactivatedMessageProcessor.java @@ -94,8 +94,9 @@ public class ApplicationInstanceInactivatedMessageProcessor extends MessageProce if (log.isWarnEnabled()) { log.warn(String.format("Application instance not exists in group: [application-id] %s" + "[instance-id] %s", event.getAppId(), event.getInstanceId())); - return false; } + + return false; } ApplicationStatus status = ApplicationStatus.Inactive; if (!context.isStateTransitionValid(status)) { http://git-wip-us.apache.org/repos/asf/stratos/blob/7bc01c17/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/application/ApplicationInstanceTerminatingMessageProcessor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/application/ApplicationInstanceTerminatingMessageProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/application/ApplicationInstanceTerminatingMessageProcessor.java index 85a28fd..bd184a1 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/application/ApplicationInstanceTerminatingMessageProcessor.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/application/ApplicationInstanceTerminatingMessageProcessor.java @@ -94,8 +94,9 @@ public class ApplicationInstanceTerminatingMessageProcessor extends MessageProce if (log.isWarnEnabled()) { log.warn(String.format("Application Instance not exists in Group: [AppId] %s" + "[instanceId] %s", event.getAppId(), event.getInstanceId())); - return false; } + + return false; } ApplicationStatus status = ApplicationStatus.Terminating; if (!context.isStateTransitionValid(status)) {
