Repository: hadoop Updated Branches: refs/heads/branch-2 fbe86471c -> ce8cdc109
HADOOP-14272. Azure: WasbRemoteCallHelper should use String equals for comparison. Contributed by Santhosh G Nayak (cherry picked from commit 27a44b60c1a55cabbf1873bca62db4e321c901ca) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ce8cdc10 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ce8cdc10 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ce8cdc10 Branch: refs/heads/branch-2 Commit: ce8cdc109b306f83cdcbecae1b8dd8b00fd35202 Parents: fbe8647 Author: Mingliang Liu <[email protected]> Authored: Tue Apr 4 11:03:59 2017 -0700 Committer: Mingliang Liu <[email protected]> Committed: Tue Apr 4 11:04:42 2017 -0700 ---------------------------------------------------------------------- .../java/org/apache/hadoop/fs/azure/WasbRemoteCallHelper.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/ce8cdc10/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azure/WasbRemoteCallHelper.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azure/WasbRemoteCallHelper.java b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azure/WasbRemoteCallHelper.java index 09ea084..b43e5ae 100644 --- a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azure/WasbRemoteCallHelper.java +++ b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azure/WasbRemoteCallHelper.java @@ -88,7 +88,8 @@ class WasbRemoteCallHelper { } Header contentTypeHeader = response.getFirstHeader("Content-Type"); - if (contentTypeHeader == null || contentTypeHeader.getValue() != APPLICATION_JSON) { + if (contentTypeHeader == null + || !APPLICATION_JSON.equals(contentTypeHeader.getValue())) { throw new WasbRemoteCallException(getRequest.getURI().toString() + ":" + "Content-Type mismatch: expected: " + APPLICATION_JSON + ", got " + ((contentTypeHeader!=null) ? contentTypeHeader.getValue() : "NULL") --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
