You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2014/01/31 19:18:51 UTC
[1/5] git commit: updated refs/heads/4.3 to 8c45ab0
Updated Branches:
refs/heads/4.3 a5f73b728 -> 8c45ab076
findbugs: assign result of string manipulations
(cherry picked from commit 20127e09dc0e341a2f790a8a52cded4c5f1f0cc1)
Signed-off-by: Daan Hoogland <da...@onecht.net>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f5f22c9d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f5f22c9d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f5f22c9d
Branch: refs/heads/4.3
Commit: f5f22c9d3b1d9ff0d602327f009b4c390a4015ab
Parents: a5f73b7
Author: Daan Hoogland <da...@onecht.net>
Authored: Sun Jan 26 23:49:56 2014 +0100
Committer: Daan Hoogland <da...@onecht.net>
Committed: Fri Jan 31 19:15:55 2014 +0100
----------------------------------------------------------------------
.../network/security/SecurityGroupManagerImpl.java | 7 ++++---
server/src/com/cloud/test/IPRangeConfig.java | 13 ++++++-------
2 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f5f22c9d/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java b/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
index c7b6e1e..e48bb34 100755
--- a/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
+++ b/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
@@ -42,6 +42,7 @@ import javax.naming.ConfigurationException;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.command.user.securitygroup.AuthorizeSecurityGroupEgressCmd;
import org.apache.cloudstack.api.command.user.securitygroup.AuthorizeSecurityGroupIngressCmd;
import org.apache.cloudstack.api.command.user.securitygroup.CreateSecurityGroupCmd;
@@ -376,7 +377,7 @@ public class SecurityGroupManagerImpl extends ManagerBase implements SecurityGro
protected String generateRulesetSignature(Map<PortAndProto, Set<String>> ingress, Map<PortAndProto, Set<String>> egress) {
String ruleset = ingress.toString();
- ruleset.concat(egress.toString());
+ ruleset = ruleset.concat(egress.toString());
return DigestUtils.md5Hex(ruleset);
}
@@ -401,7 +402,7 @@ public class SecurityGroupManagerImpl extends ManagerBase implements SecurityGro
if (s_logger.isTraceEnabled()) {
s_logger.trace("Security Group Mgr: scheduling ruleset updates for " + affectedVms.size() + " vms");
}
- boolean locked = _workLock.lock(_globalWorkLockTimeout);
+ boolean locked = _workLock.lock(_globalWorkLockTimeout);
if (!locked) {
s_logger.warn("Security Group Mgr: failed to acquire global work lock");
return;
@@ -885,7 +886,7 @@ public class SecurityGroupManagerImpl extends ManagerBase implements SecurityGro
_serverId = ManagementServerNode.getManagementServerId();
- s_logger.info("SecurityGroupManager: num worker threads=" + _numWorkerThreads +
+ s_logger.info("SecurityGroupManager: num worker threads=" + _numWorkerThreads +
", time between cleanups=" + _timeBetweenCleanups + " global lock timeout=" + _globalWorkLockTimeout);
createThreadPools();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f5f22c9d/server/src/com/cloud/test/IPRangeConfig.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/test/IPRangeConfig.java b/server/src/com/cloud/test/IPRangeConfig.java
index 23ca1bb..0669c55 100755
--- a/server/src/com/cloud/test/IPRangeConfig.java
+++ b/server/src/com/cloud/test/IPRangeConfig.java
@@ -28,7 +28,6 @@ import java.util.Vector;
import com.cloud.utils.component.ComponentContext;
import com.cloud.utils.db.DB;
-import com.cloud.utils.db.Transaction;
import com.cloud.utils.db.TransactionLegacy;
import com.cloud.utils.net.NetUtils;
@@ -72,7 +71,7 @@ public class IPRangeConfig {
long zoneId = PodZoneConfig.getZoneId(zone);
result = changeRange(op, "public", -1, zoneId, startIP, endIP, null, -1);
- result.replaceAll("<br>", "/n");
+ result = result.replaceAll("<br>", "/n");
System.out.println(result);
} else if (type.equals("private")) {
if (args.length != 5 && args.length != 6) {
@@ -94,7 +93,7 @@ public class IPRangeConfig {
long podId = PodZoneConfig.getPodId(pod, zone);
long zoneId = PodZoneConfig.getZoneId(zone);
result = changeRange(op, "private", podId, zoneId, startIP, endIP, null, -1);
- result.replaceAll("<br>", "/n");
+ result = result.replaceAll("<br>", "/n");
System.out.println(result);
} else {
printError(usage());
@@ -515,7 +514,7 @@ public class IPRangeConfig {
} catch (Exception ex) {
System.out.print(ex.getMessage());
ex.printStackTrace();
- }
+ }
return problemIPs;
}
@@ -574,7 +573,7 @@ public class IPRangeConfig {
// return DatabaseConfig.getDatabaseValueString("SELECT * FROM `cloud`.`configuration` WHERE name = \"guest.ip.network\"", "value",
// "Unable to start DB connection to read guest IP network. Please contact Cloud Support.");
// }
-//
+//
// public static String getGuestNetmask() {
// return DatabaseConfig.getDatabaseValueString("SELECT * FROM `cloud`.`configuration` WHERE name = \"guest.netmask\"", "value",
// "Unable to start DB connection to read guest netmask. Please contact Cloud Support.");
@@ -583,10 +582,10 @@ public class IPRangeConfig {
// public static String getGuestSubnet() {
// String guestIpNetwork = getGuestIpNetwork();
// String guestNetmask = getGuestNetmask();
-//
+//
// if (guestIpNetwork == null || guestIpNetwork.isEmpty()) printError("Please enter a valid guest IP network address.");
// if (guestNetmask == null || guestNetmask.isEmpty()) printError("Please enter a valid guest IP network netmask");
-//
+//
// return NetUtils.getSubNet(guestIpNetwork, guestNetmask);
// }
[2/5] git commit: updated refs/heads/4.3 to 8c45ab0
Posted by da...@apache.org.
findbugs get proper object from map
(cherry picked from commit 901cf8ab32e8077e3b64204c89418181fd5ce0b6)
Signed-off-by: Daan Hoogland <da...@onecht.net>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/92ac450c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/92ac450c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/92ac450c
Branch: refs/heads/4.3
Commit: 92ac450ca0b13068a976b6123d6c575c6efa4793
Parents: f5f22c9
Author: Daan Hoogland <da...@onecht.net>
Authored: Fri Jan 31 08:53:14 2014 +0100
Committer: Daan Hoogland <da...@onecht.net>
Committed: Fri Jan 31 19:16:30 2014 +0100
----------------------------------------------------------------------
server/src/com/cloud/network/vpc/VpcManagerImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/92ac450c/server/src/com/cloud/network/vpc/VpcManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
index b9dd729..f7c38d4 100644
--- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java
+++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
@@ -432,14 +432,14 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
List<VpcOfferingServiceMapVO> map = _vpcOffSvcMapDao.listByVpcOffId(vpcOffId);
for (VpcOfferingServiceMapVO instance : map) {
- String service = instance.getService();
+ Service service = Service.getService(instance.getService());
Set<Provider> providers;
providers = serviceProviderMap.get(service);
if (providers == null) {
providers = new HashSet<Provider>();
}
providers.add(Provider.getProvider(instance.getProvider()));
- serviceProviderMap.put(Service.getService(service), providers);
+ serviceProviderMap.put(service, providers);
}
return serviceProviderMap;
[5/5] git commit: updated refs/heads/4.3 to 8c45ab0
Posted by da...@apache.org.
findbugs Long comparison == -> equals()
(cherry picked from commit f4db8df66fbcb5df3cd9bbf607ede9a4d514fe4a)
Signed-off-by: Daan Hoogland <da...@onecht.net>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8c45ab07
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8c45ab07
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8c45ab07
Branch: refs/heads/4.3
Commit: 8c45ab0761c533a26467fc89c9ca6d2424a720fb
Parents: 6aa3fd8
Author: Daan Hoogland <da...@onecht.net>
Authored: Fri Jan 31 09:07:55 2014 +0100
Committer: Daan Hoogland <da...@onecht.net>
Committed: Fri Jan 31 19:17:58 2014 +0100
----------------------------------------------------------------------
server/src/com/cloud/template/TemplateManagerImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8c45ab07/server/src/com/cloud/template/TemplateManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/template/TemplateManagerImpl.java b/server/src/com/cloud/template/TemplateManagerImpl.java
index 681be4a..3bfe5c8 100755
--- a/server/src/com/cloud/template/TemplateManagerImpl.java
+++ b/server/src/com/cloud/template/TemplateManagerImpl.java
@@ -1801,7 +1801,7 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager,
}
// Don't allow to modify system template
- if (id == Long.valueOf(1)) {
+ if (Long.valueOf(1).equals(id)) {
InvalidParameterValueException ex = new InvalidParameterValueException("Unable to update template/iso of specified id");
ex.addProxyObject(String.valueOf(id), "templateId");
throw ex;
[3/5] git commit: updated refs/heads/4.3 to 8c45ab0
Posted by da...@apache.org.
findbugs explicit toString on enum for call get(Object)
(cherry picked from commit cce4a055ae9bdda1e3f5ae2c95efc9dace75814b)
Signed-off-by: Daan Hoogland <da...@onecht.net>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5d11f9b1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5d11f9b1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5d11f9b1
Branch: refs/heads/4.3
Commit: 5d11f9b14991d14d386a7ee7f22d9cb755e03c0d
Parents: 92ac450
Author: Daan Hoogland <da...@onecht.net>
Authored: Fri Jan 31 08:58:50 2014 +0100
Committer: Daan Hoogland <da...@onecht.net>
Committed: Fri Jan 31 19:16:55 2014 +0100
----------------------------------------------------------------------
server/src/com/cloud/network/guru/ControlNetworkGuru.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5d11f9b1/server/src/com/cloud/network/guru/ControlNetworkGuru.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/guru/ControlNetworkGuru.java b/server/src/com/cloud/network/guru/ControlNetworkGuru.java
index 26caa61..2461b16 100755
--- a/server/src/com/cloud/network/guru/ControlNetworkGuru.java
+++ b/server/src/com/cloud/network/guru/ControlNetworkGuru.java
@@ -218,12 +218,12 @@ public class ControlNetworkGuru extends PodBasedNetworkGuru implements NetworkGu
Map<String, String> dbParams = _configDao.getConfiguration(params);
- _cidr = dbParams.get(Config.ControlCidr);
+ _cidr = dbParams.get(Config.ControlCidr.toString());
if (_cidr == null) {
_cidr = "169.254.0.0/16";
}
- _gateway = dbParams.get(Config.ControlGateway);
+ _gateway = dbParams.get(Config.ControlGateway.toString());
if (_gateway == null) {
_gateway = NetUtils.getLinkLocalGateway();
}
[4/5] git commit: updated refs/heads/4.3 to 8c45ab0
Posted by da...@apache.org.
findbugs get from map with proper key-type
(cherry picked from commit a4f2f0b39fadf3510e15c8955a50a3a4a5d7c694)
Signed-off-by: Daan Hoogland <da...@onecht.net>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6aa3fd8a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6aa3fd8a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6aa3fd8a
Branch: refs/heads/4.3
Commit: 6aa3fd8a81be7dc5b94b9315bf43b60cf42d897c
Parents: 5d11f9b
Author: Daan Hoogland <da...@onecht.net>
Authored: Fri Jan 31 09:06:11 2014 +0100
Committer: Daan Hoogland <da...@onecht.net>
Committed: Fri Jan 31 19:17:21 2014 +0100
----------------------------------------------------------------------
server/src/com/cloud/network/NetworkModelImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6aa3fd8a/server/src/com/cloud/network/NetworkModelImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkModelImpl.java b/server/src/com/cloud/network/NetworkModelImpl.java
index 27b2006..f64c68a 100755
--- a/server/src/com/cloud/network/NetworkModelImpl.java
+++ b/server/src/com/cloud/network/NetworkModelImpl.java
@@ -1024,14 +1024,14 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel {
List<NetworkOfferingServiceMapVO> map = _ntwkOfferingSrvcDao.listByNetworkOfferingId(networkOfferingId);
for (NetworkOfferingServiceMapVO instance : map) {
- String service = instance.getService();
+ Service service = Network.Service.getService(instance.getService());
Set<Provider> providers;
providers = serviceProviderMap.get(service);
if (providers == null) {
providers = new HashSet<Provider>();
}
providers.add(Provider.getProvider(instance.getProvider()));
- serviceProviderMap.put(Service.getService(service), providers);
+ serviceProviderMap.put(service, providers);
}
return serviceProviderMap;