ApiDispatcher: Fix uuid->id translation and throw better debug statement
Signed-off-by: Rohit Yadav <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/dd5572ad Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/dd5572ad Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/dd5572ad Branch: refs/heads/marvin_refactor Commit: dd5572ad589bff8d0aeabd6a812519bb32028099 Parents: 313ac21 Author: Rohit Yadav <[email protected]> Authored: Wed Jan 23 14:56:34 2013 -0800 Committer: Prasanna Santhanam <[email protected]> Committed: Sun Mar 31 22:19:15 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/dd5572ad/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; }
