cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject [41/50] [abbrv] git commit: updated refs/heads/marvin-refactor to 5ce2643
Date Sat, 30 Mar 2013 16:56:54 GMT
ApiDispatcher: Fix uuid->id translation and throw better debug statement

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>


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

Branch: refs/heads/marvin-refactor
Commit: db154f455cb922acc5b94ca766b8eb6d66d78823
Parents: 5034746
Author: Rohit Yadav <bhaisaab@apache.org>
Authored: Wed Jan 23 14:56:34 2013 -0800
Committer: Prasanna Santhanam <tsp@apache.org>
Committed: Sat Mar 30 22:22:39 2013 +0530

----------------------------------------------------------------------
 server/src/com/cloud/api/ApiDispatcher.java |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/db154f45/server/src/com/cloud/api/ApiDispatcher.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/ApiDispatcher.java b/server/src/com/cloud/api/ApiDispatcher.java
index 925d90a..cfcccc5 100755
--- a/server/src/com/cloud/api/ApiDispatcher.java
+++ b/server/src/com/cloud/api/ApiDispatcher.java
@@ -153,11 +153,10 @@ public class ApiDispatcher {
                         queueSizeLimit = 1L;
                     }
 
-                    if (queueSizeLimit != null) {
+                if (queueSizeLimit != null) {
                     _asyncMgr.syncAsyncJobExecution(asyncCmd.getJob(), asyncCmd.getSyncObjType(),
asyncCmd.getSyncObjId().longValue(), queueSizeLimit);
-                    } else {
-                        s_logger.trace("The queue size is unlimited, skipping the synchronizing");
-                    }
+                } else {
+                    s_logger.trace("The queue size is unlimited, skipping the synchronizing");
                 }
             }
 
@@ -371,8 +370,13 @@ public class ApiDispatcher {
         if (internalId == null) {
             if (s_logger.isDebugEnabled())
                 s_logger.debug("Object entity uuid = " + uuid + " does not exist in the database.");
+<<<<<<< HEAD
             throw new InvalidParameterValueException("Invalid parameter " + annotation.name()
+ " value=" + uuid
                 + " due to incorrect long value format, or entity does not exist or due to
incorrect parameter annotation for the field in api cmd class.");
+=======
+            throw new InvalidParameterValueException("Invalid parameter value=" + uuid
+                + " due to incorrect long value format, or entity was not found as it may
have been deleted, or due to incorrect parameter annotation for the field in api cmd.");
+>>>>>>> ApiDispatcher: Fix uuid->id translation and throw better
debug statement
         }
         return internalId;
     }


Mime
View raw message