diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java index c88fbba4b81..8f656457ae0 100755 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -2157,8 +2157,6 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager throw new PermissionDeniedException("The owner of " + vm + " either does not exist or is disabled: " + vm.getAccountId()); } - - VirtualMachineTemplate template = profile.getTemplate(); if (vm.getIsoId() != null) { template = _templateDao.findById(vm.getIsoId()); diff --git a/server/src/com/cloud/vm/VirtualMachineManager.java b/server/src/com/cloud/vm/VirtualMachineManager.java index bdb92ee99b4..0a4c79646cb 100644 --- a/server/src/com/cloud/vm/VirtualMachineManager.java +++ b/server/src/com/cloud/vm/VirtualMachineManager.java @@ -101,6 +101,4 @@ public interface VirtualMachineManager extends Manager { T advanceReboot(T vm, Map params, User caller, Account account) throws InsufficientCapacityException, ResourceUnavailableException, ConcurrentOperationException, OperationTimedoutException; VMInstanceVO findById(VirtualMachine.Type type, long vmId); - - VirtualMachine start(VirtualMachine.Type type, long vmId, Map params); } diff --git a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java index 53ff451d641..8430fa39754 100644 --- a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java +++ b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java @@ -692,7 +692,7 @@ public class VirtualMachineManagerImpl implements VirtualMachineManager, StateLi continue; } catch (RuntimeException e) { s_logger.warn("Failed to start instance " + vm, e); - throw new CloudRuntimeException("Failed to start " + vm, e); + throw e; } finally { if (startedVm == null) { _workDao.updateStep(work, Step.Release); @@ -1220,12 +1220,6 @@ public class VirtualMachineManagerImpl implements VirtualMachineManager, StateLi return true; } - @Override - public VirtualMachine start(VirtualMachine.Type type, long vmId, Map params) { - - return null; - } - @Override public VMInstanceVO findById(VirtualMachine.Type type, long vmId) { VirtualMachineGuru guru = _vmGurus.get(type);