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

Fix a bug found by findbug, compare Long objects with equals instead of ==

This commit is contained in:
Hugo Trippaers 2014-01-23 07:59:43 +01:00
parent 62ef61794d
commit d19157fbb1
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
utils/src/com/cloud/utils/net/NetUtils.java
View File

@ -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;
}