cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From weiz...@apache.org
Subject git commit: updated refs/heads/master to d2e6bf5
Date Thu, 06 Jun 2013 06:04:05 GMT
Updated Branches:
  refs/heads/master c05c1052f -> d2e6bf5fa


CLOUDSTACK-2865: fix error in prepareStop


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d2e6bf5f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d2e6bf5f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d2e6bf5f

Branch: refs/heads/master
Commit: d2e6bf5fa4c424c02c39155ba41f893e2e66b617
Parents: c05c105
Author: Wei Zhou <w.zhou@leaseweb.com>
Authored: Wed Jun 5 16:43:31 2013 +0200
Committer: Wei Zhou <w.zhou@leaseweb.com>
Committed: Wed Jun 5 16:43:31 2013 +0200

----------------------------------------------------------------------
 server/src/com/cloud/vm/UserVmManagerImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d2e6bf5f/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 d8a064f..b919f12 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -4709,7 +4709,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager,
Use
 
     @Override
     public void prepareStop(VirtualMachineProfile<UserVmVO> profile) {
-        UserVmVO vm = profile.getVirtualMachine();
+        UserVmVO vm = _vmDao.findById(profile.getId());
         if (vm.getState() == State.Running)
             collectVmDiskStatistics(vm);
     }


Mime
View raw message