cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject [29/42] git commit: updated refs/heads/ui-vm-affinity to 25f2f0f
Date Wed, 24 Apr 2013 23:03:37 GMT
fix CLOUDSTACK-1944 Destruction of a VM with StaticNAT/FW throws a NullPointerException during
VM Expunge


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

Branch: refs/heads/ui-vm-affinity
Commit: 8ff442bbeb056f3da755b31019014ab6f5dd6525
Parents: 39f772e
Author: Mice Xia <mice_xia@tcloudcomputing.com>
Authored: Wed Apr 24 20:10:35 2013 +0800
Committer: Mice Xia <mice_xia@tcloudcomputing.com>
Committed: Wed Apr 24 20:11:18 2013 +0800

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8ff442bb/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 45b313f..f24288a 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -1520,6 +1520,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager,
Use
 
         @Override
         public void run() {
+            UserContext.registerContext(_accountMgr.getSystemUser().getId(), _accountMgr.getSystemAccount(),
null, false);
             GlobalLock scanLock = GlobalLock.getInternLock("UserVMExpunge");
             try {
                 if (scanLock.lock(ACQUIRE_GLOBAL_LOCK_TIMEOUT_FOR_COOPERATION)) {


Mime
View raw message