etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <github@remi.nl>
This commit is contained in:
Remi Bergsma 2015-11-22 13:20:53 +01:00
parent 32fa9e6f6f 3d5f09357b
commit a3234349b9
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/network-elements/bigswitch/src/com/cloud/network/bigswitch/BigSwitchBcfApi.java
View File

@ -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);
}
@ -400,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);
}