You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by al...@apache.org on 2014/02/04 02:19:58 UTC
[1/2] git commit: updated refs/heads/master to ea355d7
Updated Branches:
refs/heads/master 30695d7f9 -> ea355d738
listSslCerts: removed an exception thrown when there is no certificate mapped to the lbId specified in the list* command. Exception in the list* command should be thrown only when id specified in the command, is invalid CS id, but never in the case when we can't find data satisfying search criteria. In this case we just return empty list
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ea355d73
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ea355d73
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ea355d73
Branch: refs/heads/master
Commit: ea355d73837b0a04d68b6d5704a73b07bdf24721
Parents: fc56f0c
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Mon Feb 3 15:53:29 2014 -0800
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Mon Feb 3 17:20:28 2014 -0800
----------------------------------------------------------------------
.../apache/cloudstack/network/lb/CertServiceImpl.java | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ea355d73/server/src/org/apache/cloudstack/network/lb/CertServiceImpl.java
----------------------------------------------------------------------
diff --git a/server/src/org/apache/cloudstack/network/lb/CertServiceImpl.java b/server/src/org/apache/cloudstack/network/lb/CertServiceImpl.java
index dd536fe..d3c5dc5 100644
--- a/server/src/org/apache/cloudstack/network/lb/CertServiceImpl.java
+++ b/server/src/org/apache/cloudstack/network/lb/CertServiceImpl.java
@@ -53,18 +53,17 @@ import javax.crypto.NoSuchPaddingException;
import javax.ejb.Local;
import javax.inject.Inject;
-import org.apache.commons.io.IOUtils;
-import org.apache.log4j.Logger;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.openssl.PEMReader;
-import org.bouncycastle.openssl.PasswordFinder;
-
import org.apache.cloudstack.acl.SecurityChecker;
import org.apache.cloudstack.api.command.user.loadbalancer.DeleteSslCertCmd;
import org.apache.cloudstack.api.command.user.loadbalancer.ListSslCertsCmd;
import org.apache.cloudstack.api.command.user.loadbalancer.UploadSslCertCmd;
import org.apache.cloudstack.api.response.SslCertResponse;
import org.apache.cloudstack.context.CallContext;
+import org.apache.commons.io.IOUtils;
+import org.apache.log4j.Logger;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.bouncycastle.openssl.PEMReader;
+import org.bouncycastle.openssl.PasswordFinder;
import com.cloud.event.ActionEvent;
import com.cloud.event.EventTypes;
@@ -213,7 +212,8 @@ public class CertServiceImpl implements CertService {
lbCertMapRule = _lbCertDao.findByLbRuleId(lbRuleId);
if (lbCertMapRule == null) {
- throw new InvalidParameterValueException("No certificate bound to loadbalancer id: " + lbRuleId);
+ s_logger.debug("No certificate bound to loadbalancer id: " + lbRuleId);
+ return certResponseList;
}
certVO = _sslCertDao.findById(lbCertMapRule.getCertId());
[2/2] git commit: updated refs/heads/master to ea355d7
Posted by al...@apache.org.
Revert "Findbugs: different issues solved(cherry picked from commit" as it breaks UserVm API Response
This reverts commit fae05560218ef3bcb962bd424ae5dbf5cb8ede68.
Conflicts:
server/src/com/cloud/dc/DedicatedResourceVO.java
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fc56f0cf
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fc56f0cf
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fc56f0cf
Branch: refs/heads/master
Commit: fc56f0cf42895a792a257d7c5ca4ebb40d56b959
Parents: 30695d7
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Mon Feb 3 15:27:48 2014 -0800
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Mon Feb 3 17:20:28 2014 -0800
----------------------------------------------------------------------
.../com/cloud/api/query/vo/UserVmJoinVO.java | 23 ++++----
.../com/cloud/consoleproxy/AgentHookBase.java | 5 +-
.../src/com/cloud/dc/DedicatedResourceVO.java | 10 ++--
.../com/cloud/network/IpAddressManagerImpl.java | 60 +++++++++-----------
.../src/com/cloud/network/NetworkModelImpl.java | 7 +--
.../cloud/network/guru/ControlNetworkGuru.java | 4 +-
.../com/cloud/network/vpc/VpcManagerImpl.java | 4 +-
.../com/cloud/template/TemplateManagerImpl.java | 4 +-
8 files changed, 52 insertions(+), 65 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fc56f0cf/server/src/com/cloud/api/query/vo/UserVmJoinVO.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/vo/UserVmJoinVO.java b/server/src/com/cloud/api/query/vo/UserVmJoinVO.java
index 9e4fc21..2df49ec 100644
--- a/server/src/com/cloud/api/query/vo/UserVmJoinVO.java
+++ b/server/src/com/cloud/api/query/vo/UserVmJoinVO.java
@@ -35,7 +35,6 @@ import com.cloud.server.ResourceTag.ResourceObjectType;
import com.cloud.storage.Storage.StoragePoolType;
import com.cloud.storage.Volume;
import com.cloud.utils.db.GenericDao;
-import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VirtualMachine.State;
@@ -48,10 +47,10 @@ public class UserVmJoinVO extends BaseViewVO implements ControlledViewEntity {
private long id;
@Column(name = "name", updatable = false, nullable = false, length = 255)
- private final String name = null;
+ private String name = null;
@Column(name = "display_name", updatable = false, nullable = false, length = 255)
- private final String displayName = null;
+ private String displayName = null;
@Column(name = "account_id")
private long accountId;
@@ -60,7 +59,7 @@ public class UserVmJoinVO extends BaseViewVO implements ControlledViewEntity {
private String accountUuid;
@Column(name = "account_name")
- private final String accountName = null;
+ private String accountName = null;
@Column(name = "account_type")
private short accountType;
@@ -72,10 +71,10 @@ public class UserVmJoinVO extends BaseViewVO implements ControlledViewEntity {
private String domainUuid;
@Column(name = "domain_name")
- private final String domainName = null;
+ private String domainName = null;
@Column(name = "domain_path")
- private final String domainPath = null;
+ private String domainPath = null;
@Column(name = "instance_group_id")
private long instanceGroupId;
@@ -97,7 +96,7 @@ public class UserVmJoinVO extends BaseViewVO implements ControlledViewEntity {
*/
@Enumerated(value = EnumType.STRING)
@Column(name = "state", updatable = true, nullable = false, length = 32)
- private final State state = null;
+ private State state = null;
@Column(name = GenericDao.CREATED_COLUMN)
private Date created;
@@ -149,7 +148,7 @@ public class UserVmJoinVO extends BaseViewVO implements ControlledViewEntity {
private String dataCenterUuid;
@Column(name = "data_center_name")
- private final String dataCenterName = null;
+ private String dataCenterName = null;
@Column(name = "security_group_enabled")
private boolean securityGroupEnabled;
@@ -234,7 +233,7 @@ public class UserVmJoinVO extends BaseViewVO implements ControlledViewEntity {
private String volumeUuid;
@Column(name = "volume_device_id")
- private final Long volumeDeviceId = null;
+ private Long volumeDeviceId = null;
@Column(name = "volume_type")
@Enumerated(EnumType.STRING)
@@ -746,11 +745,9 @@ public class UserVmJoinVO extends BaseViewVO implements ControlledViewEntity {
}
public String getDetail(String name) {
- if (details == null) {
- throw new CloudRuntimeException("No details to get. Did you forget to load the details?");
- }
+ assert (details != null) : "Did you forget to load the details?";
- return details.get(name);
+ return details != null ? details.get(name) : null;
}
public String getUserData() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fc56f0cf/server/src/com/cloud/consoleproxy/AgentHookBase.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/consoleproxy/AgentHookBase.java b/server/src/com/cloud/consoleproxy/AgentHookBase.java
index 2e0bada..9dfffd4 100644
--- a/server/src/com/cloud/consoleproxy/AgentHookBase.java
+++ b/server/src/com/cloud/consoleproxy/AgentHookBase.java
@@ -49,7 +49,6 @@ import com.cloud.host.dao.HostDao;
import com.cloud.servlet.ConsoleProxyPasswordBasedEncryptor;
import com.cloud.servlet.ConsoleProxyServlet;
import com.cloud.utils.Ternary;
-import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.vm.VirtualMachine;
import com.cloud.vm.dao.VMInstanceDao;
@@ -193,9 +192,7 @@ public abstract class AgentHookBase implements AgentHook {
assert (ksBits != null);
if (ksBits == null) {
- String msg = "Could not find and construct a valid SSL certificate";
- s_logger.error(msg);
- throw new CloudRuntimeException(msg);
+ s_logger.error("Could not find and construct a valid SSL certificate");
}
cmd = new StartConsoleProxyAgentHttpHandlerCommand(ksBits, storePassword);
cmd.setEncryptorPassword(getEncryptorPassword());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fc56f0cf/server/src/com/cloud/dc/DedicatedResourceVO.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/dc/DedicatedResourceVO.java b/server/src/com/cloud/dc/DedicatedResourceVO.java
index e7d7b3b..2e0fde7 100644
--- a/server/src/com/cloud/dc/DedicatedResourceVO.java
+++ b/server/src/com/cloud/dc/DedicatedResourceVO.java
@@ -64,7 +64,7 @@ public class DedicatedResourceVO implements DedicatedResources {
private long affinityGroupId;
public DedicatedResourceVO() {
- uuid = UUID.randomUUID().toString();
+ this.uuid = UUID.randomUUID().toString();
}
public DedicatedResourceVO(Long dataCenterId, Long podId, Long clusterId, Long hostId, Long domainId, Long accountId, long affinityGroupId) {
@@ -74,7 +74,7 @@ public class DedicatedResourceVO implements DedicatedResources {
this.hostId = hostId;
this.domainId = domainId;
this.accountId = accountId;
- uuid = UUID.randomUUID().toString();
+ this.uuid = UUID.randomUUID().toString();
this.affinityGroupId = affinityGroupId;
}
@@ -120,7 +120,7 @@ public class DedicatedResourceVO implements DedicatedResources {
}
public DedicatedResourceVO(long dedicatedResourceId) {
- id = dedicatedResourceId;
+ this.id = dedicatedResourceId;
}
@Override
@@ -143,7 +143,7 @@ public class DedicatedResourceVO implements DedicatedResources {
@Override
public String getUuid() {
- return uuid;
+ return this.uuid;
}
public void setUuid(String uuid) {
@@ -158,7 +158,7 @@ public class DedicatedResourceVO implements DedicatedResources {
@Override
public boolean equals(Object obj) {
if (obj instanceof DedicatedResourceVO) {
- return ((DedicatedResourceVO)obj).getId() == getId();
+ return ((DedicatedResourceVO)obj).getId() == this.getId();
} else {
return false;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fc56f0cf/server/src/com/cloud/network/IpAddressManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/IpAddressManagerImpl.java b/server/src/com/cloud/network/IpAddressManagerImpl.java
index 09f73a4..6596074 100644
--- a/server/src/com/cloud/network/IpAddressManagerImpl.java
+++ b/server/src/com/cloud/network/IpAddressManagerImpl.java
@@ -17,7 +17,6 @@
package com.cloud.network;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
@@ -29,8 +28,6 @@ import java.util.UUID;
import javax.inject.Inject;
-import org.apache.log4j.Logger;
-
import org.apache.cloudstack.acl.ControlledEntity.ACLType;
import org.apache.cloudstack.acl.SecurityChecker.AccessType;
import org.apache.cloudstack.context.CallContext;
@@ -42,6 +39,7 @@ import org.apache.cloudstack.region.PortableIp;
import org.apache.cloudstack.region.PortableIpDao;
import org.apache.cloudstack.region.PortableIpVO;
import org.apache.cloudstack.region.Region;
+import org.apache.log4j.Logger;
import com.cloud.agent.AgentManager;
import com.cloud.alert.AlertManager;
@@ -572,9 +570,8 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage
IPAddressVO ip = markIpAsUnavailable(addrId);
+ assert (ip != null) : "Unable to mark the ip address id=" + addrId + " as unavailable.";
if (ip == null) {
- String msg = "Unable to mark the ip address id=" + addrId + " as unavailable.";
- s_logger.error(msg);
return true;
}
@@ -687,10 +684,10 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage
if (dedicatedVlanDbIds != null && !dedicatedVlanDbIds.isEmpty()) {
fetchFromDedicatedRange = true;
sc.setParameters("vlanId", dedicatedVlanDbIds.toArray());
- errorMessage.append(", vlanId id=" + Arrays.toString(dedicatedVlanDbIds.toArray()));
+ errorMessage.append(", vlanId id=" + dedicatedVlanDbIds.toArray());
} else if (nonDedicatedVlanDbIds != null && !nonDedicatedVlanDbIds.isEmpty()) {
sc.setParameters("vlanId", nonDedicatedVlanDbIds.toArray());
- errorMessage.append(", vlanId id=" + Arrays.toString(nonDedicatedVlanDbIds.toArray()));
+ errorMessage.append(", vlanId id=" + nonDedicatedVlanDbIds.toArray());
} else {
if (podId != null) {
InsufficientAddressCapacityException ex = new InsufficientAddressCapacityException("Insufficient address capacity", Pod.class, podId);
@@ -730,7 +727,7 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage
if (useSystemIps && nonDedicatedVlanDbIds != null && !nonDedicatedVlanDbIds.isEmpty()) {
fetchFromDedicatedRange = false;
sc.setParameters("vlanId", nonDedicatedVlanDbIds.toArray());
- errorMessage.append(", vlanId id=" + Arrays.toString(nonDedicatedVlanDbIds.toArray()));
+ errorMessage.append(", vlanId id=" + nonDedicatedVlanDbIds.toArray());
addrs = _ipAddressDao.lockRows(sc, filter, true);
}
}
@@ -855,11 +852,6 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage
public PublicIp assignDedicateIpAddress(Account owner, final Long guestNtwkId, final Long vpcId, final long dcId, final boolean isSourceNat)
throws ConcurrentOperationException, InsufficientAddressCapacityException {
- if (owner == null) {
- s_logger.error("No account to assign an ip to.");
- return null;
- }
-
final long ownerId = owner.getId();
PublicIp ip = null;
@@ -891,11 +883,13 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage
return ip;
} finally {
- if (s_logger.isDebugEnabled()) {
- s_logger.debug("Releasing lock account " + ownerId);
- }
- _accountDao.releaseFromLockTable(ownerId);
+ if (owner != null) {
+ if (s_logger.isDebugEnabled()) {
+ s_logger.debug("Releasing lock account " + ownerId);
+ }
+ _accountDao.releaseFromLockTable(ownerId);
+ }
if (ip == null) {
s_logger.error("Unable to get source nat ip address for account " + ownerId);
}
@@ -1224,7 +1218,7 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage
s_logger.debug("Associating ip " + ipToAssoc + " to network " + network);
- IPAddressVO ip = ipToAssoc; //_ipAddressDao.findById(ipId);
+ IPAddressVO ip = _ipAddressDao.findById(ipId);
//update ip address with networkId
ip.setAssociatedWithNetworkId(networkId);
ip.setSourceNat(isSourceNat);
@@ -1241,16 +1235,18 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage
return ip;
} finally {
if (!success && releaseOnFailure) {
- try {
- s_logger.warn("Failed to associate ip address, so releasing ip from the database " + ip);
- _ipAddressDao.markAsUnavailable(ip.getId());
- if (!applyIpAssociations(network, true)) {
- // if fail to apply ip assciations again, unassign ip address without updating resource
- // count and generating usage event as there is no need to keep it in the db
- _ipAddressDao.unassignIpAddress(ip.getId());
+ if (ip != null) {
+ try {
+ s_logger.warn("Failed to associate ip address, so releasing ip from the database " + ip);
+ _ipAddressDao.markAsUnavailable(ip.getId());
+ if (!applyIpAssociations(network, true)) {
+ // if fail to apply ip assciations again, unassign ip address without updating resource
+ // count and generating usage event as there is no need to keep it in the db
+ _ipAddressDao.unassignIpAddress(ip.getId());
+ }
+ } catch (Exception e) {
+ s_logger.warn("Unable to disassociate ip address for recovery", e);
}
- } catch (Exception e) {
- s_logger.warn("Unable to disassociate ip address for recovery", e);
}
}
}
@@ -1331,7 +1327,7 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage
PublicIp publicIp = PublicIp.createFromAddrAndVlan(ipToAssoc, _vlanDao.findById(ipToAssoc.getVlanId()));
ipList.add(publicIp);
Map<PublicIpAddress, Set<Service>> ipToServices = _networkModel.getIpToServices(ipList, false, true);
- if (ipToServices != null && !ipToServices.isEmpty()) {
+ if (ipToServices != null & !ipToServices.isEmpty()) {
Set<Service> services = ipToServices.get(publicIp);
if (services != null && !services.isEmpty()) {
throw new InvalidParameterValueException("IP " + ipToAssoc + " has services and rules associated in the network " + networkId);
@@ -1372,7 +1368,7 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage
PublicIp publicIp = PublicIp.createFromAddrAndVlan(ip, _vlanDao.findById(ip.getVlanId()));
ipList.add(publicIp);
Map<PublicIpAddress, Set<Service>> ipToServices = _networkModel.getIpToServices(ipList, false, true);
- if (ipToServices != null && !ipToServices.isEmpty()) {
+ if (ipToServices != null & !ipToServices.isEmpty()) {
Set<Service> ipServices = ipToServices.get(publicIp);
if (ipServices != null && !ipServices.isEmpty()) {
return false;
@@ -1675,14 +1671,14 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage
@Override
public boolean applyStaticNats(List<? extends StaticNat> staticNats, boolean continueOnError, boolean forRevoke) throws ResourceUnavailableException {
+ Network network = _networksDao.findById(staticNats.get(0).getNetworkId());
+ boolean success = true;
+
if (staticNats == null || staticNats.size() == 0) {
s_logger.debug("There are no static nat rules for the network elements");
return true;
}
- Network network = _networksDao.findById(staticNats.get(0).getNetworkId());
- boolean success = true;
-
// get the list of public ip's owned by the network
List<IPAddressVO> userIps = _ipAddressDao.listByAssociatedNetwork(network.getId(), null);
List<PublicIp> publicIps = new ArrayList<PublicIp>();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fc56f0cf/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 68807d3..52a08e1 100755
--- a/server/src/com/cloud/network/NetworkModelImpl.java
+++ b/server/src/com/cloud/network/NetworkModelImpl.java
@@ -1017,14 +1017,14 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel {
List<NetworkOfferingServiceMapVO> map = _ntwkOfferingSrvcDao.listByNetworkOfferingId(networkOfferingId);
for (NetworkOfferingServiceMapVO instance : map) {
- Service service = Network.Service.getService(instance.getService());
+ String service = 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, providers);
+ serviceProviderMap.put(Service.getService(service), providers);
}
return serviceProviderMap;
@@ -1533,9 +1533,6 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel {
@Override
public void checkNetworkPermissions(Account owner, Network network) {
- if (network == null) {
- throw new CloudRuntimeException("no network to check permissions for.");
- }
// Perform account permission check
if (network.getGuestType() != Network.GuestType.Shared || (network.getGuestType() == Network.GuestType.Shared && network.getAclType() == ACLType.Account)) {
AccountVO networkOwner = _accountDao.findById(network.getAccountId());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fc56f0cf/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 13ff385..a6e2180 100755
--- a/server/src/com/cloud/network/guru/ControlNetworkGuru.java
+++ b/server/src/com/cloud/network/guru/ControlNetworkGuru.java
@@ -224,12 +224,12 @@ public class ControlNetworkGuru extends PodBasedNetworkGuru implements NetworkGu
Map<String, String> dbParams = _configDao.getConfiguration(params);
- _cidr = dbParams.get(Config.ControlCidr.toString());
+ _cidr = dbParams.get(Config.ControlCidr);
if (_cidr == null) {
_cidr = "169.254.0.0/16";
}
- _gateway = dbParams.get(Config.ControlGateway.toString());
+ _gateway = dbParams.get(Config.ControlGateway);
if (_gateway == null) {
_gateway = NetUtils.getLinkLocalGateway();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fc56f0cf/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 a2521d0..909e464 100644
--- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java
+++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
@@ -425,14 +425,14 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
List<VpcOfferingServiceMapVO> map = _vpcOffSvcMapDao.listByVpcOffId(vpcOffId);
for (VpcOfferingServiceMapVO instance : map) {
- Service service = Service.getService(instance.getService());
+ String service = 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, providers);
+ serviceProviderMap.put(Service.getService(service), providers);
}
return serviceProviderMap;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fc56f0cf/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 c2ce344..93e3c59 100755
--- a/server/src/com/cloud/template/TemplateManagerImpl.java
+++ b/server/src/com/cloud/template/TemplateManagerImpl.java
@@ -425,7 +425,7 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager,
if (isISO) {
desc = Upload.Type.ISO.toString();
}
- eventId = (eventId == null ? 0 : eventId);
+ eventId = eventId == null ? 0 : eventId;
if (!_accountMgr.isRootAdmin(caller.getType()) && _disableExtraction) {
throw new PermissionDeniedException("Extraction has been disabled by admin");
@@ -1779,7 +1779,7 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager,
}
// Don't allow to modify system template
- if (Long.valueOf(1).equals(id)) {
+ if (id == Long.valueOf(1)) {
InvalidParameterValueException ex = new InvalidParameterValueException("Unable to update template/iso of specified id");
ex.addProxyObject(String.valueOf(id), "templateId");
throw ex;