You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ch...@apache.org on 2015/04/03 12:18:48 UTC
[1/2] stratos git commit: Minor cleanup on code clarity
Repository: stratos
Updated Branches:
refs/heads/master 0d7ee705a -> b33737357
Minor cleanup on code clarity
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/b3373735
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/b3373735
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/b3373735
Branch: refs/heads/master
Commit: b337373572634cae89469664c9fd3f9d21f71c28
Parents: 7bc01c1
Author: Chamila de Alwis <ch...@apache.org>
Authored: Wed Apr 1 10:51:25 2015 +0530
Committer: Chamila de Alwis <ch...@apache.org>
Committed: Fri Apr 3 15:05:20 2015 +0530
----------------------------------------------------------------------
.../cloud/controller/messaging/topology/TopologyBuilder.java | 1 -
.../processor/topology/ClusterInstanceTerminatingProcessor.java | 3 +++
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/b3373735/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java
index 62260c1..ee5cee6 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java
@@ -1059,7 +1059,6 @@ public class TopologyBuilder {
" [instance-id] %s [current-status] %s [status-requested] %s",
event.getClusterId(), event.getInstanceId(),
context.getStatus(), status));
- return;
}
} finally {
TopologyManager.releaseWriteLock();
http://git-wip-us.apache.org/repos/asf/stratos/blob/b3373735/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterInstanceTerminatingProcessor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterInstanceTerminatingProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterInstanceTerminatingProcessor.java
index 0058dff..75b53b1 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterInstanceTerminatingProcessor.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterInstanceTerminatingProcessor.java
@@ -115,7 +115,10 @@ public class ClusterInstanceTerminatingProcessor extends MessageProcessor {
log.warn("Cluster Instance Context is not found for [cluster] " +
event.getClusterId() + " [instance-id] " +
event.getInstanceId());
+
+ return false;
}
+
ClusterStatus status = ClusterStatus.Terminating;
if (!context.isStateTransitionValid(status)) {
log.error("Invalid State Transition from " + context.getStatus() + " to " + status);
[2/2] stratos git commit: Avoid possible NPE in ApplicationInstance*
message processors
Posted by ch...@apache.org.
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 <ch...@apache.org>
Authored: Wed Apr 1 05:28:28 2015 +0530
Committer: Chamila de Alwis <ch...@apache.org>
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)) {