Repository: incubator-ranger Updated Branches: refs/heads/master c484cecae -> fa19908a9
RANGER-472 : Fix 400 error Signed-off-by: sneethiraj <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/fa19908a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/fa19908a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/fa19908a Branch: refs/heads/master Commit: fa19908a9bc6d2f80a26635d48012c87341b1f5d Parents: c484cec Author: Gautam Borad <[email protected]> Authored: Mon May 18 12:00:05 2015 +0530 Committer: sneethiraj <[email protected]> Committed: Mon May 18 02:36:31 2015 -0400 ---------------------------------------------------------------------- .../java/org/apache/hadoop/crypto/key/kms/server/KMS.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/fa19908a/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMS.java ---------------------------------------------------------------------- diff --git a/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMS.java b/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMS.java index 9b5b5a1..5575eab 100644 --- a/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMS.java +++ b/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMS.java @@ -316,10 +316,13 @@ public class KMS { } } ); - Object json = KMSServerJSONUtils.toJSON(keyVersion); - kmsAudit.ok(user, KMSOp.GET_CURRENT_KEY, name, ""); - return Response.ok().type(MediaType.APPLICATION_JSON).entity(json).build(); + if (keyVersion != null) { + kmsAudit.ok(user, KMSOp.GET_CURRENT_KEY, name, ""); + return Response.ok().type(MediaType.APPLICATION_JSON).entity(json).build(); + }else{ + return Response.status(404).type(MediaType.APPLICATION_JSON).entity(json).build(); + } } @GET
