From 1d3a0c95573d6c5f63ba92e332fc93d9b166efe5 Mon Sep 17 00:00:00 2001
From: Todd Lipcon <todd@apache.org>
Date: Thu, 1 Mar 2012 00:08:13 +0000
Subject: [PATCH] Fix two more issues from trunk merge just committed --
 removal of VersionedProtocol

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1295349 13f79535-47bb-0310-9956-ffa450edef68
---
 .../HAServiceProtocolClientSideTranslatorPB.java    | 13 -------------
 .../apache/hadoop/ha/TestFailoverController.java    | 12 ------------
 2 files changed, 25 deletions(-)

diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/protocolPB/HAServiceProtocolClientSideTranslatorPB.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/protocolPB/HAServiceProtocolClientSideTranslatorPB.java
index 4a67aa6141..3bf4f6f013 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/protocolPB/HAServiceProtocolClientSideTranslatorPB.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/protocolPB/HAServiceProtocolClientSideTranslatorPB.java
@@ -71,19 +71,6 @@ public HAServiceProtocolClientSideTranslatorPB(InetSocketAddress addr,
         RPC.getProtocolVersion(HAServiceProtocolPB.class), addr, conf);
   }
   
-  @Override
-  public long getProtocolVersion(String protocol, long clientVersion)
-      throws IOException {
-    return rpcProxy.getProtocolVersion(protocol, clientVersion);
-  }
-
-  @Override
-  public ProtocolSignature getProtocolSignature(String protocol,
-      long clientVersion, int clientMethodsHash) throws IOException {
-    return rpcProxy.getProtocolSignature(protocol, clientVersion,
-        clientMethodsHash);
-  }
-
   @Override
   public void monitorHealth() throws IOException {
     try {
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestFailoverController.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestFailoverController.java
index 1e206b4c3b..9e2cc75e9d 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestFailoverController.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestFailoverController.java
@@ -50,18 +50,6 @@ private class DummyService implements HAServiceProtocol {
       this.state = state;
     }
 
-    @Override
-    public long getProtocolVersion(String protocol, long clientVersion)
-        throws IOException {
-      return 0;
-    }
-
-    @Override
-    public ProtocolSignature getProtocolSignature(String protocol,
-        long clientVersion, int clientMethodsHash) throws IOException {
-      return null;
-    }
-
     @Override
     public void monitorHealth() throws HealthCheckFailedException, IOException {
       // Do nothing