HADOOP-12088. KMSClientProvider uses equalsIgnoreCase("application/json"). (Brahma Reddy Battula via stevel)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/05fa3368 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/05fa3368 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/05fa3368 Branch: refs/heads/YARN-1197 Commit: 05fa3368f12d189a95a2d6cd8eebc6f7e3a719ee Parents: 9141e1a Author: Steve Loughran <ste...@apache.org> Authored: Mon Jul 20 13:02:51 2015 +0100 Committer: Steve Loughran <ste...@apache.org> Committed: Mon Jul 20 13:03:03 2015 +0100 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../java/org/apache/hadoop/crypto/key/kms/KMSClientProvider.java | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/05fa3368/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 18475b9..bfa9aac 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -975,6 +975,9 @@ Release 2.8.0 - UNRELEASED HADOOP-12209 Comparable type should be in FileStatus. (Yong Zhang via stevel) + HADOOP-12088. KMSClientProvider uses equalsIgnoreCase("application/json"). + (Brahma Reddy Battula via stevel) + Release 2.7.2 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/05fa3368/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/kms/KMSClientProvider.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/kms/KMSClientProvider.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/kms/KMSClientProvider.java index 223e69a..1ffc44d 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/kms/KMSClientProvider.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/kms/KMSClientProvider.java @@ -544,7 +544,9 @@ public class KMSClientProvider extends KeyProvider implements CryptoExtension, // AuthenticatedURL properly to set authToken post initialization) } HttpExceptionUtils.validateResponse(conn, expectedResponse); - if (APPLICATION_JSON_MIME.equalsIgnoreCase(conn.getContentType()) + if (conn.getContentType() != null + && conn.getContentType().trim().toLowerCase() + .startsWith(APPLICATION_JSON_MIME) && klass != null) { ObjectMapper mapper = new ObjectMapper(); InputStream is = null;