Updated Branches: refs/heads/4.2 c6d9919c8 -> 0d862a924
CLOUDSTACK-3712 Use Vminstance instead of user vm for scaling stopped vms. Signed off by : nitin mehta<nitin.me...@citrix.com> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0d862a92 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0d862a92 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0d862a92 Branch: refs/heads/4.2 Commit: 0d862a92474c41af8a09b39da81c8afc96a906bc Parents: c6d9919 Author: Nitin Mehta <nitin.me...@citrix.com> Authored: Thu Jul 25 14:30:25 2013 +0530 Committer: Nitin Mehta <nitin.me...@citrix.com> Committed: Thu Jul 25 14:38:29 2013 +0530 ---------------------------------------------------------------------- server/src/com/cloud/vm/UserVmManagerImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0d862a92/server/src/com/cloud/vm/UserVmManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java index 0771233..a60412d 100755 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -774,7 +774,8 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Use Account caller = UserContext.current().getCaller(); // Verify input parameters - UserVmVO vmInstance = _vmDao.findById(vmId); + //UserVmVO vmInstance = _vmDao.findById(vmId); + VMInstanceVO vmInstance = _vmInstanceDao.findById(vmId); if (vmInstance == null) { throw new InvalidParameterValueException( "unable to find a virtual machine with id " + vmId);
