Skip to content

Commit d6bbfbb

Browse files
DaanHooglandDaan Hoogland
DaanHoogland
authored and
Daan Hoogland
committed
findbugs: nullpointer guards and wrappertype comparisons
1 parent dcda79e commit d6bbfbb

3 files changed

Lines changed: 36 additions & 38 deletions

File tree

‎server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package com.cloud.resourcelimit;
1818

1919
import java.util.ArrayList;
20+
import java.util.Arrays;
2021
import java.util.EnumMap;
2122
import java.util.List;
2223
import java.util.Map;
@@ -29,6 +30,9 @@
2930
import javax.inject.Inject;
3031
import javax.naming.ConfigurationException;
3132

33+
import org.apache.log4j.Logger;
34+
import org.springframework.stereotype.Component;
35+
3236
import org.apache.cloudstack.acl.SecurityChecker.AccessType;
3337
import org.apache.cloudstack.context.CallContext;
3438
import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine;
@@ -38,8 +42,6 @@
3842
import org.apache.cloudstack.storage.datastore.db.SnapshotDataStoreVO;
3943
import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreDao;
4044
import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreVO;
41-
import org.apache.log4j.Logger;
42-
import org.springframework.stereotype.Component;
4345

4446
import com.cloud.alert.AlertManager;
4547
import com.cloud.configuration.Config;
@@ -72,12 +74,10 @@
7274
import com.cloud.service.dao.ServiceOfferingDao;
7375
import com.cloud.storage.DataStoreRole;
7476
import com.cloud.storage.SnapshotVO;
75-
import com.cloud.storage.VMTemplateHostVO;
7677
import com.cloud.storage.VMTemplateStorageResourceAssoc.Status;
7778
import com.cloud.storage.VMTemplateVO;
7879
import com.cloud.storage.dao.SnapshotDao;
7980
import com.cloud.storage.dao.VMTemplateDao;
80-
import com.cloud.storage.dao.VMTemplateHostDao;
8181
import com.cloud.storage.dao.VolumeDao;
8282
import com.cloud.storage.dao.VolumeDaoImpl.SumCount;
8383
import com.cloud.user.Account;
@@ -95,21 +95,19 @@
9595
import com.cloud.utils.db.JoinBuilder;
9696
import com.cloud.utils.db.SearchBuilder;
9797
import com.cloud.utils.db.SearchCriteria;
98-
import com.cloud.utils.db.TransactionCallback;
99-
import com.cloud.utils.db.TransactionCallbackWithExceptionNoReturn;
100-
import com.cloud.utils.db.TransactionStatus;
10198
import com.cloud.utils.db.SearchCriteria.Func;
10299
import com.cloud.utils.db.SearchCriteria.Op;
103100
import com.cloud.utils.db.Transaction;
101+
import com.cloud.utils.db.TransactionCallback;
102+
import com.cloud.utils.db.TransactionCallbackWithExceptionNoReturn;
103+
import com.cloud.utils.db.TransactionStatus;
104104
import com.cloud.utils.exception.CloudRuntimeException;
105105
import com.cloud.vm.UserVmVO;
106106
import com.cloud.vm.VirtualMachine;
107107
import com.cloud.vm.VirtualMachine.State;
108108
import com.cloud.vm.dao.UserVmDao;
109109
import com.cloud.vm.dao.VMInstanceDao;
110110

111-
import java.util.Arrays;
112-
113111
@Component
114112
@Local(value = { ResourceLimitService.class })
115113
public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLimitService {
@@ -871,7 +869,7 @@ public Long doInTransaction(TransactionStatus status) {
871869
}
872870
_resourceCountDao.setResourceCount(accountId, ResourceOwnerType.Account, type, (newCount == null) ? 0 : newCount.longValue());
873871

874-
if (oldCount != newCount) {
872+
if (!Long.valueOf(oldCount).equals(newCount)) {
875873
s_logger.info("Discrepency in the resource count " + "(original count=" + oldCount + " correct count = " +
876874
newCount + ") for type " + type + " for account ID " + accountId + " is fixed during resource count recalculation.");
877875
}

‎server/src/com/cloud/storage/VolumeApiServiceImpl.java‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -445,29 +445,29 @@ protected VolumeVO persistVolume(final Account owner, final Long zoneId, final S
445445
return Transaction.execute(new TransactionCallback<VolumeVO>() {
446446
@Override
447447
public VolumeVO doInTransaction(TransactionStatus status) {
448-
VolumeVO volume = new VolumeVO(volumeName, zoneId, -1, -1, -1, new Long(-1), null, null, 0, Volume.Type.DATADISK);
449-
volume.setPoolId(null);
450-
volume.setDataCenterId(zoneId);
451-
volume.setPodId(null);
452-
volume.setAccountId(owner.getAccountId());
453-
volume.setDomainId(owner.getDomainId());
454-
long diskOfferingId = _diskOfferingDao.findByUniqueName("Cloud.com-Custom").getId();
455-
volume.setDiskOfferingId(diskOfferingId);
456-
// volume.setSize(size);
457-
volume.setInstanceId(null);
458-
volume.setUpdated(new Date());
459-
volume.setDomainId((owner == null) ? Domain.ROOT_DOMAIN : owner.getDomainId());
460-
volume.setFormat(ImageFormat.valueOf(format));
461-
volume = _volsDao.persist(volume);
462-
CallContext.current().setEventDetails("Volume Id: " + volume.getId());
448+
VolumeVO volume = new VolumeVO(volumeName, zoneId, -1, -1, -1, new Long(-1), null, null, 0, Volume.Type.DATADISK);
449+
volume.setPoolId(null);
450+
volume.setDataCenterId(zoneId);
451+
volume.setPodId(null);
452+
volume.setAccountId((owner == null) ? null : owner.getAccountId());
453+
volume.setDomainId((owner == null) ? Domain.ROOT_DOMAIN : owner.getDomainId());
454+
long diskOfferingId = _diskOfferingDao.findByUniqueName("Cloud.com-Custom").getId();
455+
volume.setDiskOfferingId(diskOfferingId);
456+
// volume.setSize(size);
457+
volume.setInstanceId(null);
458+
volume.setUpdated(new Date());
459+
volume.setDomainId((owner == null) ? Domain.ROOT_DOMAIN : owner.getDomainId());
460+
volume.setFormat(ImageFormat.valueOf(format));
461+
volume = _volsDao.persist(volume);
462+
CallContext.current().setEventDetails("Volume Id: " + volume.getId());
463+
464+
// Increment resource count during allocation; if actual creation fails,
465+
// decrement it
466+
_resourceLimitMgr.incrementResourceCount(volume.getAccountId(), ResourceType.volume);
467+
_resourceLimitMgr.incrementResourceCount(volume.getAccountId(), ResourceType.secondary_storage, UriUtils.getRemoteSize(url));
463468

464-
// Increment resource count during allocation; if actual creation fails,
465-
// decrement it
466-
_resourceLimitMgr.incrementResourceCount(volume.getAccountId(), ResourceType.volume);
467-
_resourceLimitMgr.incrementResourceCount(volume.getAccountId(), ResourceType.secondary_storage, UriUtils.getRemoteSize(url));
468-
469-
return volume;
470-
}
469+
return volume;
470+
}
471471
});
472472
}
473473

‎server/src/com/cloud/vm/UserVmManagerImpl.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@
3434
import javax.inject.Inject;
3535
import javax.naming.ConfigurationException;
3636

37+
import org.apache.commons.codec.binary.Base64;
38+
import org.apache.log4j.Logger;
39+
3740
import org.apache.cloudstack.acl.ControlledEntity.ACLType;
3841
import org.apache.cloudstack.acl.SecurityChecker.AccessType;
3942
import org.apache.cloudstack.affinity.AffinityGroupService;
@@ -79,8 +82,6 @@
7982
import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
8083
import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
8184
import org.apache.cloudstack.storage.to.TemplateObjectTO;
82-
import org.apache.commons.codec.binary.Base64;
83-
import org.apache.log4j.Logger;
8485

8586
import com.cloud.agent.AgentManager;
8687
import com.cloud.agent.api.Answer;
@@ -455,7 +456,6 @@ public enum UserVmCloneType {
455456
protected boolean _dailyOrHourly = false;
456457
private int capacityReleaseInterval;
457458

458-
protected String _name;
459459
protected String _instance;
460460
protected String _zone;
461461
protected boolean _instanceNameFlag;
@@ -1315,7 +1315,7 @@ private boolean upgradeRunningVirtualMachine(Long vmId, Long newServiceOfferingI
13151315
_accountMgr.checkAccess(caller, null, true, vmInstance);
13161316

13171317
//Check if its a scale "up"
1318-
ServiceOfferingVO newServiceOffering = (ServiceOfferingVO) _offeringDao.findById(newServiceOfferingId);
1318+
ServiceOfferingVO newServiceOffering = _offeringDao.findById(newServiceOfferingId);
13191319
if (newServiceOffering.isDynamic()) {
13201320
newServiceOffering.setDynamicFlag(true);
13211321
validateCustomParameters(newServiceOffering, customParameters);
@@ -4287,13 +4287,13 @@ public void checkHostsDedication (VMInstanceVO vm, long srcHostId, long destHost
42874287

42884288
//if hosts are dedicated to different account/domains, raise an alert
42894289
if (srcExplDedicated && destExplDedicated) {
4290-
if((accountOfDedicatedHost(srcHost) != null) && (accountOfDedicatedHost(srcHost)!= accountOfDedicatedHost(destHost))) {
4290+
if (!((accountOfDedicatedHost(srcHost) == null) || (accountOfDedicatedHost(srcHost).equals(accountOfDedicatedHost(destHost))))) {
42914291
String msg = "VM is being migrated from host " + srcHost.getName() + " explicitly dedicated to account " + accountOfDedicatedHost(srcHost) +
42924292
" to host " + destHost.getName() + " explicitly dedicated to account " + accountOfDedicatedHost(destHost);
42934293
_alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_USERVM, vm.getDataCenterId(), vm.getPodIdToDeployIn(), msg, msg);
42944294
s_logger.warn(msg);
42954295
}
4296-
if((domainOfDedicatedHost(srcHost) != null) && (domainOfDedicatedHost(srcHost)!= domainOfDedicatedHost(destHost))) {
4296+
if (!((domainOfDedicatedHost(srcHost) == null) || (domainOfDedicatedHost(srcHost).equals(domainOfDedicatedHost(destHost))))) {
42974297
String msg = "VM is being migrated from host " + srcHost.getName() + " explicitly dedicated to domain " + domainOfDedicatedHost(srcHost) +
42984298
" to host " + destHost.getName() + " explicitly dedicated to domain " + domainOfDedicatedHost(destHost);
42994299
_alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_USERVM, vm.getDataCenterId(), vm.getPodIdToDeployIn(), msg, msg);

0 commit comments

Comments
 (0)