From 2ebb1f47db373a7775ff2cec3585ffbba62e33ca Mon Sep 17 00:00:00 2001 From: Harsh J Date: Fri, 25 May 2012 13:21:30 +0000 Subject: [PATCH] MAPREDUCE-3302. Remove the last dependency call from org.apache.hadoop.record package in MR. (harsh) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1342613 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../apache/hadoop/mapreduce/security/SecureShuffleUtils.java | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 77a08d4c4be..c3bece55cc0 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -52,6 +52,9 @@ Trunk (unreleased changes) HADOOP-8285 MR changes for Use ProtoBuf for RpcPayLoadHeader (sanjay radia) + MAPREDUCE-3302. Remove the last dependency call from + org.apache.hadoop.record package in MR. (harsh) + BUG FIXES MAPREDUCE-4100. [Gridmix] Bug fixed in compression emulation feature for diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/SecureShuffleUtils.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/SecureShuffleUtils.java index ef9fe2cbdc0..c4c07dddc8a 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/SecureShuffleUtils.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/SecureShuffleUtils.java @@ -29,6 +29,7 @@ import javax.servlet.http.HttpServletRequest; import org.apache.commons.codec.binary.Base64; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceStability; +import org.apache.hadoop.io.WritableComparator; import org.apache.hadoop.mapreduce.security.token.JobTokenSecretManager; import org.apache.hadoop.record.Utils; @@ -67,7 +68,7 @@ public class SecureShuffleUtils { */ private static boolean verifyHash(byte[] hash, byte[] msg, SecretKey key) { byte[] msg_hash = generateByteHash(msg, key); - return Utils.compareBytes(msg_hash, 0, msg_hash.length, hash, 0, hash.length) == 0; + return WritableComparator.compareBytes(msg_hash, 0, msg_hash.length, hash, 0, hash.length) == 0; } /**