Repository: cloudstack Updated Branches: refs/heads/acl-item-cidrs 00704ee68 -> e90d595d3
Findbugs: Fix Upgrade430to440.java:119, ES_COMPARING_STRINGS_WITH_EQ, Priority: High Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d1efdca5 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d1efdca5 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d1efdca5 Branch: refs/heads/acl-item-cidrs Commit: d1efdca50622a0b67ae1a286aad3297b1c748e9e Parents: 52c4f00 Author: Hugo Trippaers <[email protected]> Authored: Mon Feb 24 17:01:04 2014 +0100 Committer: Hugo Trippaers <[email protected]> Committed: Mon Feb 24 17:01:04 2014 +0100 ---------------------------------------------------------------------- engine/schema/src/com/cloud/upgrade/dao/Upgrade430to440.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d1efdca5/engine/schema/src/com/cloud/upgrade/dao/Upgrade430to440.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade430to440.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade430to440.java index 3b967e7..f2cc5d3 100644 --- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade430to440.java +++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade430to440.java @@ -23,9 +23,9 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import com.cloud.network.Network; import org.apache.log4j.Logger; +import com.cloud.network.Network; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.script.Script; @@ -116,7 +116,7 @@ public class Upgrade430to440 implements DbUpgrade { if (networkRs.next()) { String guesttype = networkRs.getString(1); - if (guesttype == Network.GuestType.Shared.toString()) { + if (guesttype.equals(Network.GuestType.Shared.toString())) { pstmtUpdate = conn.prepareStatement("UPDATE `cloud`.`user_ip_address` SET account_id = ?, domain_id= ? WHERE public_ip_address = ?"); pstmtUpdate.setLong(1,vmAccountId); pstmtUpdate.setLong(2,vmDomainId);
