Repository: cloudstack Updated Branches: refs/heads/master b35489339 -> 265208a26
removed some redundant Boolean isntantiations Signed-off-by: Laszlo Hornyak <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2c4ac5e4 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2c4ac5e4 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2c4ac5e4 Branch: refs/heads/master Commit: 2c4ac5e4d3392da6b9be5979b49d94650e9f3b1a Parents: b354893 Author: Laszlo Hornyak <[email protected]> Authored: Fri Mar 21 21:52:06 2014 +0100 Committer: Laszlo Hornyak <[email protected]> Committed: Sat Mar 22 18:34:45 2014 +0100 ---------------------------------------------------------------------- .../src/com/cloud/vm/VirtualMachineManagerImpl.java | 4 ++-- server/src/com/cloud/api/ApiServer.java | 2 +- server/src/com/cloud/resource/ResourceManagerImpl.java | 4 ++-- server/src/com/cloud/storage/upload/UploadMonitorImpl.java | 2 +- server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2c4ac5e4/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java ---------------------------------------------------------------------- diff --git a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java index 2ff870a..bbd49f2 100755 --- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java +++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java @@ -5238,7 +5238,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac NicVO nic = _entityMgr.findById(NicVO.class, work.getNicId()); boolean result = orchestrateRemoveNicFromVm(vm, nic); return new Pair<JobInfo.Status, String>(JobInfo.Status.SUCCEEDED, - _jobMgr.marshallResultObject(new Boolean(result))); + _jobMgr.marshallResultObject(result)); } private Pair<JobInfo.Status, String> orchestrateRemoveVmFromNetwork(VmWorkRemoveVmFromNetwork work) throws Exception { @@ -5250,7 +5250,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac boolean result = orchestrateRemoveVmFromNetwork(vm, work.getNetwork(), work.getBroadcastUri()); return new Pair<JobInfo.Status, String>(JobInfo.Status.SUCCEEDED, - _jobMgr.marshallResultObject(new Boolean(result))); + _jobMgr.marshallResultObject(result)); } private Pair<JobInfo.Status, String> orchestrateReconfigure(VmWorkReconfigure work) throws Exception { http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2c4ac5e4/server/src/com/cloud/api/ApiServer.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/ApiServer.java b/server/src/com/cloud/api/ApiServer.java index e4486c1..bde3f24 100755 --- a/server/src/com/cloud/api/ApiServer.java +++ b/server/src/com/cloud/api/ApiServer.java @@ -885,7 +885,7 @@ public class ApiServer extends ManagerBase implements HttpRequestHandler, ApiSer session.setAttribute("type", Short.valueOf(account.getType()).toString()); session.setAttribute("registrationtoken", userAcct.getRegistrationToken()); - session.setAttribute("registered", new Boolean(userAcct.isRegistered()).toString()); + session.setAttribute("registered", Boolean.toString(userAcct.isRegistered())); if (timezone != null) { session.setAttribute("timezone", timezone); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2c4ac5e4/server/src/com/cloud/resource/ResourceManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/resource/ResourceManagerImpl.java b/server/src/com/cloud/resource/ResourceManagerImpl.java index f9a59ba..d822c24 100755 --- a/server/src/com/cloud/resource/ResourceManagerImpl.java +++ b/server/src/com/cloud/resource/ResourceManagerImpl.java @@ -816,8 +816,8 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, final List<StoragePoolHostVO> pools = _storagePoolHostDao.listByHostIdIncludingRemoved(hostId); ResourceStateAdapter.DeleteHostAnswer answer = - (ResourceStateAdapter.DeleteHostAnswer)dispatchToStateAdapters(ResourceStateAdapter.Event.DELETE_HOST, false, host, new Boolean(isForced), new Boolean( - isForceDeleteStorage)); + (ResourceStateAdapter.DeleteHostAnswer)dispatchToStateAdapters(ResourceStateAdapter.Event.DELETE_HOST, false, host, isForced, + isForceDeleteStorage); if (answer == null) { throw new CloudRuntimeException("No resource adapter respond to DELETE_HOST event for " + host.getName() + " id = " + hostId + ", hypervisorType is " + http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2c4ac5e4/server/src/com/cloud/storage/upload/UploadMonitorImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/storage/upload/UploadMonitorImpl.java b/server/src/com/cloud/storage/upload/UploadMonitorImpl.java index 8a997b2..35cb665 100755 --- a/server/src/com/cloud/storage/upload/UploadMonitorImpl.java +++ b/server/src/com/cloud/storage/upload/UploadMonitorImpl.java @@ -104,7 +104,7 @@ public class UploadMonitorImpl extends ManagerBase implements UploadMonitor { @Inject private DataStoreManager storeMgr; - private Boolean _sslCopy = new Boolean(false); + private boolean _sslCopy = false; private String _ssvmUrlDomain; private ScheduledExecutorService _executor = null; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2c4ac5e4/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java b/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java index 37cdf86..b30fd14 100644 --- a/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java +++ b/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java @@ -1053,7 +1053,7 @@ public class VMSnapshotManagerImpl extends ManagerBase implements VMSnapshotMana public Pair<JobInfo.Status, String> orchestrateDeleteVMSnapshot(VmWorkDeleteVMSnapshot work) { boolean result = orchestrateDeleteVMSnapshot(work.getVmSnapshotId()); return new Pair<JobInfo.Status, String>(JobInfo.Status.SUCCEEDED, - _jobMgr.marshallResultObject(new Boolean(result))); + _jobMgr.marshallResultObject(result)); } public Pair<JobInfo.Status, String> orchestrateRevertToVMSnapshot(VmWorkRevertToVMSnapshot work) throws Exception { @@ -1064,7 +1064,7 @@ public class VMSnapshotManagerImpl extends ManagerBase implements VMSnapshotMana public Pair<JobInfo.Status, String> orchestrateDeleteAllVMSnapshots(VmWorkDeleteAllVMSnapshots work) { boolean result = orchestrateDeleteAllVMSnapshots(work.getVmId(), work.getSnapshotType()); return new Pair<JobInfo.Status, String>(JobInfo.Status.SUCCEEDED, - _jobMgr.marshallResultObject(new Boolean(result))); + _jobMgr.marshallResultObject(result)); } @Override
