CLOUDSTACK-5752: Use pesudo job context when API dispather directly calls into orchestration flow

kelveny · kelveny · commit a05d71a80c16 · 2014-01-09T14:29:13.000-08:00
diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/AsyncJobExecutionContext.java b/framework/jobs/src/org/apache/cloudstack/framework/jobs/AsyncJobExecutionContext.java
@@ -150,6 +150,10 @@ public void completeJobAndJoin(JobInfo.Status joinStatus, String joinResult) {
 
     public static AsyncJobExecutionContext getCurrentExecutionContext() {
         AsyncJobExecutionContext context = s_currentExectionContext.get();
+        if (context == null) {
+            context = registerPseudoExecutionContext(CallContext.current().getCallingAccountId(),
+                    CallContext.current().getCallingUserId());
+        }
         return context;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -150,6 +150,10 @@ public void completeJobAndJoin(JobInfo.Status joinStatus, String joinResult) {`
`150`	`150`
`151`	`151`	`public static AsyncJobExecutionContext getCurrentExecutionContext() {`
`152`	`152`	`AsyncJobExecutionContext context = s_currentExectionContext.get();`
	`153`	`+ if (context == null) {`
	`154`	`+ context = registerPseudoExecutionContext(CallContext.current().getCallingAccountId(),`
	`155`	`+ CallContext.current().getCallingUserId());`
	`156`	`+ }`
`153`	`157`	`return context;`
`154`	`158`	`}`
`155`	`159`