svn commit: r1295349 - in /hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src: main/java/org/apache/hadoop/ha/protocolPB/HAServiceProtocolClientSideTranslatorPB.java test/java/org/apache/hadoop/ha/TestFailoverController.java

[todd]

Author: todd
Date: Thu Mar  1 00:08:13 2012
New Revision: 1295349

URL: http://svn.apache.org/viewvc?rev=1295349&view=rev
Log:
Fix two more issues from trunk merge just committed -- removal of 
VersionedProtocol

Modified:
    
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/protocolPB/HAServiceProtocolClientSideTranslatorPB.java
    
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestFailoverController.java

Modified: 
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/protocolPB/HAServiceProtocolClientSideTranslatorPB.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/protocolPB/HAServiceProtocolClientSideTranslatorPB.java?rev=1295349&r1=1295348&r2=1295349&view=diff
==============================================================================
--- 
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/protocolPB/HAServiceProtocolClientSideTranslatorPB.java
 (original)
+++ 
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/protocolPB/HAServiceProtocolClientSideTranslatorPB.java
 Thu Mar  1 00:08:13 2012
@@ -72,19 +72,6 @@ public class HAServiceProtocolClientSide
   }
   
   @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 {
       rpcProxy.monitorHealth(NULL_CONTROLLER, MONITOR_HEALTH_REQ);

Modified: 
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestFailoverController.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestFailoverController.java?rev=1295349&r1=1295348&r2=1295349&view=diff
==============================================================================
--- 
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestFailoverController.java
 (original)
+++ 
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestFailoverController.java
 Thu Mar  1 00:08:13 2012
@@ -51,18 +51,6 @@ public class TestFailoverController {
     }
 
     @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
     }