You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2014/12/14 07:39:54 UTC
stratos git commit: Fixing NPE in cloud controller topology builder
Repository: stratos
Updated Branches:
refs/heads/4.1.0-test d9d91484a -> d1cd45be2
Fixing NPE in cloud controller topology builder
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/d1cd45be
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/d1cd45be
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/d1cd45be
Branch: refs/heads/4.1.0-test
Commit: d1cd45be2527eedb6ee37df04209816e2713393b
Parents: d9d9148
Author: Imesh Gunaratne <im...@apache.org>
Authored: Sun Dec 14 12:09:31 2014 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Sun Dec 14 12:09:47 2014 +0530
----------------------------------------------------------------------
.../cloud/controller/messaging/topology/TopologyBuilder.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/d1cd45be/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 c83662f..27bb2ba 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
@@ -740,13 +740,12 @@ public class TopologyBuilder {
}
Member member = cluster.getMember(memberId);
- String instanceId = member.getInstanceId();
-
if (member == null) {
- log.warn(String.format("Member with member id %s does not exist",
+ log.warn(String.format("Member %s does not exist",
memberId));
return;
}
+ String instanceId = member.getInstanceId();
try {
TopologyManager.acquireWriteLock();