Repository: cloudstack Updated Branches: refs/heads/master 86b02e65e -> c6d254993
removed commented-out code Signed-off-by: Laszlo Hornyak <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/843464ef Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/843464ef Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/843464ef Branch: refs/heads/master Commit: 843464efc844d7f129e44127bca33e09e76e4503 Parents: 96d56b7 Author: Laszlo Hornyak <[email protected]> Authored: Sun Mar 23 09:47:21 2014 +0100 Committer: Laszlo Hornyak <[email protected]> Committed: Mon Mar 24 19:05:47 2014 +0100 ---------------------------------------------------------------------- server/src/com/cloud/api/ApiServlet.java | 23 ----------------------- 1 file changed, 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/843464ef/server/src/com/cloud/api/ApiServlet.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/ApiServlet.java b/server/src/com/cloud/api/ApiServlet.java index 2ecab36..f10f67a 100755 --- a/server/src/com/cloud/api/ApiServlet.java +++ b/server/src/com/cloud/api/ApiServlet.java @@ -309,19 +309,6 @@ public class ApiServlet extends HttpServlet { } if (_apiServer.verifyRequest(params, userId)) { - /* - * if (accountObj != null) { Account userAccount = (Account)accountObj; if (userAccount.getType() == - * Account.ACCOUNT_TYPE_NORMAL) { params.put(BaseCmd.Properties.USER_ID.getName(), new String[] { userId }); - * params.put(BaseCmd.Properties.ACCOUNT.getName(), new String[] { account }); - * params.put(BaseCmd.Properties.DOMAIN_ID.getName(), new String[] { domainId }); - * params.put(BaseCmd.Properties.ACCOUNT_OBJ.getName(), new Object[] { accountObj }); } else { - * params.put(BaseCmd.Properties.USER_ID.getName(), new String[] { userId }); - * params.put(BaseCmd.Properties.ACCOUNT_OBJ.getName(), new Object[] { accountObj }); } } - * - * // update user context info here so that we can take information if the request is authenticated // via api - * key mechanism updateUserContext(params, session != null ? session.getId() : null); - */ - auditTrailSb.insert(0, "(userId=" + CallContext.current().getCallingUserId() + " accountId=" + CallContext.current().getCallingAccount().getId() + " sessionId=" + (session != null ? session.getId() : null) + ")"); @@ -362,16 +349,6 @@ public class ApiServlet extends HttpServlet { } } - /* - * private void updateUserContext(Map<String, Object[]> requestParameters, String sessionId) { String userIdStr = - * (String)(requestParameters.get(BaseCmd.Properties.USER_ID.getName())[0]); Account accountObj = - * (Account)(requestParameters.get(BaseCmd.Properties.ACCOUNT_OBJ.getName())[0]); - * - * Long userId = null; Long accountId = null; if(userIdStr != null) userId = Long.parseLong(userIdStr); - * - * if(accountObj != null) accountId = accountObj.getId(); UserContext.updateContext(userId, accountId, sessionId); } - */ - // FIXME: rather than isError, we might was to pass in the status code to give more flexibility private void writeResponse(final HttpServletResponse resp, final String response, final int responseCode, final String responseType) { try {
