From f593f14bfb209d624eea17f3f1b5af50795c49ca Mon Sep 17 00:00:00 2001 From: Todd Lipcon Date: Tue, 1 Feb 2011 22:25:26 +0000 Subject: [PATCH] HADOOP-7129. Fix typo in method name getProtocolSigature. Contributed by Todd Lipcon. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1066248 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES.txt | 2 ++ .../org/apache/hadoop/ipc/ProtocolSignature.java | 16 ++++++++++++++-- .../org/apache/hadoop/ipc/VersionedProtocol.java | 2 +- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 9fe0bf3d7a..2622a7521e 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -61,6 +61,8 @@ Trunk (unreleased changes) HADOOP-6939. Inconsistent lock ordering in AbstractDelegationTokenSecretManager. (Todd Lipcon via tomwhite) + HADOOP-7129. Fix typo in method name getProtocolSigature (todd) + Release 0.22.0 - Unreleased INCOMPATIBLE CHANGES diff --git a/src/java/org/apache/hadoop/ipc/ProtocolSignature.java b/src/java/org/apache/hadoop/ipc/ProtocolSignature.java index 8d4890c1ae..e3d1c3e4bd 100644 --- a/src/java/org/apache/hadoop/ipc/ProtocolSignature.java +++ b/src/java/org/apache/hadoop/ipc/ProtocolSignature.java @@ -225,7 +225,7 @@ static ProtocolSignature getProtocolSignature( * @throws IOException if any error occurs */ @SuppressWarnings("unchecked") - public static ProtocolSignature getProtocolSigature(VersionedProtocol server, + public static ProtocolSignature getProtocolSignature(VersionedProtocol server, String protocol, long clientVersion, int clientMethodsHash) throws IOException { Class inter; @@ -238,4 +238,16 @@ public static ProtocolSignature getProtocolSigature(VersionedProtocol server, return ProtocolSignature.getProtocolSignature( clientMethodsHash, serverVersion, inter); } -} \ No newline at end of file + + /** + * @deprecated Misspelled method name - to be removed after references + * to this typo have been fixed in HDFS and MapRed. + */ + @Deprecated + public static ProtocolSignature getProtocolSigature(VersionedProtocol server, + String protocol, + long clientVersion, int clientMethodsHash) throws IOException { + return getProtocolSignature(server, protocol, clientVersion, + clientMethodsHash); + } +} diff --git a/src/java/org/apache/hadoop/ipc/VersionedProtocol.java b/src/java/org/apache/hadoop/ipc/VersionedProtocol.java index 352f2599f0..4558f2150d 100644 --- a/src/java/org/apache/hadoop/ipc/VersionedProtocol.java +++ b/src/java/org/apache/hadoop/ipc/VersionedProtocol.java @@ -45,7 +45,7 @@ public long getProtocolVersion(String protocol, * @param clientMethodsHash the hashcode of client protocol methods * @return the server protocol signature containing its version and * a list of its supported methods - * @see ProtocolSignature#getProtocolSigature(VersionedProtocol, String, + * @see ProtocolSignature#getProtocolSignature(VersionedProtocol, String, * long, int) for a default implementation */ public ProtocolSignature getProtocolSignature(String protocol,