You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2015/11/22 13:21:39 UTC
[1/3] git commit: updated refs/heads/master to a323434
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 <da...@onecht.net>
Authored: Mon Nov 2 11:29:03 2015 +0100
Committer: Daan Hoogland <da...@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);
}
[2/3] git commit: updated refs/heads/master to a323434
Posted by re...@apache.org.
findbugs: instead of !=, use string utils
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9a798c53
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9a798c53
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9a798c53
Branch: refs/heads/master
Commit: 9a798c537eaeca45118724209c4136e838255b08
Parents: ea7c2d9
Author: Daan Hoogland <da...@onecht.net>
Authored: Tue Sep 15 20:36:53 2015 +0200
Committer: Daan Hoogland <da...@onecht.net>
Committed: Mon Nov 16 18:30:36 2015 +0100
----------------------------------------------------------------------
.../src/com/cloud/network/bigswitch/BigSwitchBcfApi.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9a798c53/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 16cb3f7..2e9c0fa 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
@@ -47,6 +47,7 @@ import org.apache.commons.httpclient.methods.PutMethod;
import org.apache.commons.httpclient.methods.StringRequestEntity;
import org.apache.commons.httpclient.protocol.Protocol;
import org.apache.commons.httpclient.protocol.ProtocolSocketFactory;
+import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
import com.google.gson.Gson;
@@ -296,7 +297,7 @@ public class BigSwitchBcfApi {
m.setRequestHeader(CONTENT_TYPE, CONTENT_JSON);
m.setRequestHeader(ACCEPT, CONTENT_JSON);
m.setRequestHeader(HTTP_HEADER_INSTANCE_ID, CLOUDSTACK_INSTANCE_ID + "-" + zoneId);
- if (hash != "" ) {
+ if (StringUtils.isNotEmpty(hash)) {
m.setRequestHeader(HASH_MATCH, hash);
}
[3/3] git commit: updated refs/heads/master to a323434
Posted by re...@apache.org.
Merge pull request #1019 from DaanHoogland/PMD
findbugs: ! equals instead of !=simple pmd warning fixed
* pr/1019:
use equals instead of comparison operators on strings
findbugs: instead of !=, use string utils
Signed-off-by: Remi Bergsma <gi...@remi.nl>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a3234349
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a3234349
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a3234349
Branch: refs/heads/master
Commit: a3234349b957b096cabf3787cfd6f14d5d9a4557
Parents: 32fa9e6 3d5f093
Author: Remi Bergsma <gi...@remi.nl>
Authored: Sun Nov 22 13:20:53 2015 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Sun Nov 22 13:20:53 2015 +0100
----------------------------------------------------------------------
.../src/com/cloud/network/bigswitch/BigSwitchBcfApi.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------