From 78fa5e14ee4d46a8e241d46725bc1c7e563ca5fb Mon Sep 17 00:00:00 2001
From: Alex Huang <alex.huang@gmail.com>
Date: Wed, 3 Jul 2013 15:26:39 -0700
Subject: [PATCH] Fixed null pointer in ServerContexts

---
 .../src/org/apache/cloudstack/context/ServerContexts.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/engine/components-api/src/org/apache/cloudstack/context/ServerContexts.java b/engine/components-api/src/org/apache/cloudstack/context/ServerContexts.java
index ce4079a7e78..2c3757234a5 100644
--- a/engine/components-api/src/org/apache/cloudstack/context/ServerContexts.java
+++ b/engine/components-api/src/org/apache/cloudstack/context/ServerContexts.java
@@ -40,9 +40,11 @@ public class ServerContexts {
 
     public static void unregisterUserContext() {
         CallContext context = CallContext.unregister();
-        AsyncJobExecutionContext.unregister();
-        Transaction txn = (Transaction)context.getContextParameter("Transaction");
-        txn.close(Thread.currentThread().getName());
+        if (context != null) {
+            AsyncJobExecutionContext.unregister();
+            Transaction txn = (Transaction)context.getContextParameter("Transaction");
+            txn.close(Thread.currentThread().getName());
+        }
     }
 
     /**