Repository: cloudstack Updated Branches: refs/heads/master 6f0b57216 -> cd62aecb2
conflict headers removed from comment Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/cd62aecb Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cd62aecb Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cd62aecb Branch: refs/heads/master Commit: cd62aecb2f2407e950960336d606a1a32b410f83 Parents: 6f0b572 Author: Daan Hoogland <d...@onecht.net> Authored: Thu May 22 10:00:05 2014 +0200 Committer: Daan Hoogland <d...@onecht.net> Committed: Thu May 22 10:00:05 2014 +0200 ---------------------------------------------------------------------- api/src/org/apache/cloudstack/context/CallContext.java | 3 --- 1 file changed, 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cd62aecb/api/src/org/apache/cloudstack/context/CallContext.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/context/CallContext.java b/api/src/org/apache/cloudstack/context/CallContext.java index bf4818b..f29ae96 100644 --- a/api/src/org/apache/cloudstack/context/CallContext.java +++ b/api/src/org/apache/cloudstack/context/CallContext.java @@ -145,10 +145,7 @@ public class CallContext { protected static CallContext register(User callingUser, Account callingAccount, Long userId, Long accountId, String contextId) { /* -<<<<<<< HEAD Unit tests will have multiple times of setup/tear-down call to this, remove assertions to all unit test to run -======= ->>>>>>> a7a8a19... BUG-ID: CS-19295: add job path to help associate an API job to related internal job. Reviewed-By: Self assert s_currentContext.get() == null : "There's a context already so what does this new register context mean? " + s_currentContext.get().toString(); if (s_currentContext.get() != null) { // FIXME: This should be removed soon. I added this check only to surface all the places that have this problem. throw new CloudRuntimeException("There's a context already so what does this new register context mean? " + s_currentContext.get().toString());
