commit fd415cbae66dac326bdcbbfba74f408d9d1109bd
author ramangrover29 <ramangrover29@gmail.com> Fri Feb 07 22:21:27 2014 +0530
committer ramangrover29 <ramangrover29@gmail.com> Fri Feb 07 22:21:27 2014 +0530
tree 705c6594fa102a65752171dcdba93be308c32213
parent c0628f937e5ebe588a66bc94427a9d45119c38bd

fix for issue 712

asterix-events/src/main/java/edu/uci/ics/asterix/event/service/AsterixEventServiceUtil.java

diff --git a/asterix-events/src/main/java/edu/uci/ics/asterix/event/service/AsterixEventServiceUtil.java b/asterix-events/src/main/java/edu/uci/ics/asterix/event/service/AsterixEventServiceUtil.java
index f6765e9..3a7dbd4 100644
--- a/asterix-events/src/main/java/edu/uci/ics/asterix/event/service/AsterixEventServiceUtil.java
+++ b/asterix-events/src/main/java/edu/uci/ics/asterix/event/service/AsterixEventServiceUtil.java
@@ -507,12 +507,14 @@
         boolean conflictFound = false;
         AsterixInstance conflictingInstance = null;
         for (AsterixInstance existing : existingInstances) {
-            conflictFound = !existing.getState().equals(State.INACTIVE)
-                    && existing.getCluster().getMasterNode().getClusterIp().equals(masterIp);
+            if (existing.getState().equals(State.INACTIVE)) {
+                continue;
+            }
+            conflictFound = existing.getCluster().getMasterNode().getClusterIp().equals(masterIp);
             if (conflictFound) {
                 conflictingInstance = existing;
                 break;
-            }
+            } 
             for (Node n : existing.getCluster().getNode()) {
                 if (usedIps.contains(n.getClusterIp())) {
                     conflictFound = true;