Updated Branches: refs/heads/master 62ef61794 -> c2da28034
Fix a bug found by findbug, compare Long objects with equals instead of == Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d19157fb Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d19157fb Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d19157fb Branch: refs/heads/master Commit: d19157fbb169eec029d1efee9ddd06e6b6aad9a4 Parents: 62ef617 Author: Hugo Trippaers <htrippa...@schubergphilis.com> Authored: Thu Jan 23 07:59:43 2014 +0100 Committer: Hugo Trippaers <htrippa...@schubergphilis.com> Committed: Thu Jan 23 09:06:32 2014 +0100 ---------------------------------------------------------------------- utils/src/com/cloud/utils/net/NetUtils.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d19157fb/utils/src/com/cloud/utils/net/NetUtils.java ---------------------------------------------------------------------- diff --git a/utils/src/com/cloud/utils/net/NetUtils.java b/utils/src/com/cloud/utils/net/NetUtils.java index 8e994f1..f64b230 100755 --- a/utils/src/com/cloud/utils/net/NetUtils.java +++ b/utils/src/com/cloud/utils/net/NetUtils.java @@ -41,13 +41,14 @@ import org.apache.commons.lang.SystemUtils; import org.apache.commons.net.util.SubnetUtils; import org.apache.log4j.Logger; -import com.cloud.utils.IteratorUtil; -import com.cloud.utils.Pair; -import com.cloud.utils.script.Script; import com.googlecode.ipv6.IPv6Address; import com.googlecode.ipv6.IPv6AddressRange; import com.googlecode.ipv6.IPv6Network; +import com.cloud.utils.IteratorUtil; +import com.cloud.utils.Pair; +import com.cloud.utils.script.Script; + public class NetUtils { protected final static Logger s_logger = Logger.getLogger(NetUtils.class); public final static String HTTP_PORT = "80"; @@ -832,7 +833,7 @@ public class NetUtils { if (cidrALong[1] < cidrBLong[1]) { //this implies cidrA is super set of cidrB return supersetOrSubset.isSuperset; - } else if (cidrALong[1] == cidrBLong[1]) { + } else if (cidrALong[1].equals(cidrBLong[1])) { //this implies both the cidrs are equal return supersetOrSubset.sameSubnet; } @@ -1209,7 +1210,7 @@ public class NetUtils { public static boolean isValidIpv6(String ip) { try { - IPv6Address address = IPv6Address.fromString(ip); + IPv6Address.fromString(ip); } catch (IllegalArgumentException ex) { return false; } @@ -1218,7 +1219,7 @@ public class NetUtils { public static boolean isValidIp6Cidr(String ip6Cidr) { try { - IPv6Network network = IPv6Network.fromString(ip6Cidr); + IPv6Network.fromString(ip6Cidr); } catch (IllegalArgumentException ex) { return false; }
