cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject [1/3] git commit: updated refs/heads/master to a323434
Date Sun, 22 Nov 2015 12:21:39 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 32fa9e6f6 -> a3234349b


use equals instead of comparison operators on strings


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3d5f0935
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3d5f0935
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3d5f0935

Branch: refs/heads/master
Commit: 3d5f09357b21bd115fb1e6d5c2ad1b743b2bf90c
Parents: 9a798c5
Author: Daan Hoogland <daan@onecht.net>
Authored: Mon Nov 2 11:29:03 2015 +0100
Committer: Daan Hoogland <daan@onecht.net>
Committed: Mon Nov 16 18:30:36 2015 +0100

----------------------------------------------------------------------
 .../src/com/cloud/network/bigswitch/BigSwitchBcfApi.java         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3d5f0935/plugins/network-elements/bigswitch/src/com/cloud/network/bigswitch/BigSwitchBcfApi.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/bigswitch/src/com/cloud/network/bigswitch/BigSwitchBcfApi.java
b/plugins/network-elements/bigswitch/src/com/cloud/network/bigswitch/BigSwitchBcfApi.java
index 2e9c0fa..c1d10dd 100644
--- a/plugins/network-elements/bigswitch/src/com/cloud/network/bigswitch/BigSwitchBcfApi.java
+++ b/plugins/network-elements/bigswitch/src/com/cloud/network/bigswitch/BigSwitchBcfApi.java
@@ -401,10 +401,10 @@ public class BigSwitchBcfApi {
             gm.releaseConnection();
         }
         if(returnValue instanceof ControlClusterStatus) {
-            if(hash == HASH_CONFLICT) {
+            if(HASH_CONFLICT.equals(hash)) {
                 isMaster = true;
                 ((ControlClusterStatus) returnValue).setTopologySyncRequested(true);
-            } else if (hash != HASH_IGNORE && !isMaster) {
+            } else if (!HASH_IGNORE.equals(hash) && !isMaster) {
                 isMaster = true;
                 ((ControlClusterStatus) returnValue).setTopologySyncRequested(true);
             }


Mime
View raw message