From 8ff442bbeb056f3da755b31019014ab6f5dd6525 Mon Sep 17 00:00:00 2001
From: Mice Xia <mice_xia@tcloudcomputing.com>
Date: Wed, 24 Apr 2013 20:10:35 +0800
Subject: [PATCH] fix CLOUDSTACK-1944 Destruction of a VM with StaticNAT/FW
 throws a NullPointerException during VM Expunge

---
 server/src/com/cloud/vm/UserVmManagerImpl.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java
index 45b313fdb5f..f24288a4415 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)) {