You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by la...@apache.org on 2012/10/06 04:59:37 UTC
svn commit: r1394908 -
/hbase/branches/0.94/security/src/main/java/org/apache/hadoop/hbase/ipc/SecureRpcEngine.java
Author: larsh
Date: Sat Oct 6 02:59:37 2012
New Revision: 1394908
URL: http://svn.apache.org/viewvc?rev=1394908&view=rev
Log:
HBASE-6920 Addendum - fix SecureRpcEngine
Modified:
hbase/branches/0.94/security/src/main/java/org/apache/hadoop/hbase/ipc/SecureRpcEngine.java
Modified: hbase/branches/0.94/security/src/main/java/org/apache/hadoop/hbase/ipc/SecureRpcEngine.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/security/src/main/java/org/apache/hadoop/hbase/ipc/SecureRpcEngine.java?rev=1394908&r1=1394907&r2=1394908&view=diff
==============================================================================
--- hbase/branches/0.94/security/src/main/java/org/apache/hadoop/hbase/ipc/SecureRpcEngine.java (original)
+++ hbase/branches/0.94/security/src/main/java/org/apache/hadoop/hbase/ipc/SecureRpcEngine.java Sat Oct 6 02:59:37 2012
@@ -196,7 +196,7 @@ public class SecureRpcEngine implements
public VersionedProtocol getProxy(
Class<? extends VersionedProtocol> protocol, long clientVersion,
InetSocketAddress addr, User ticket,
- Configuration conf, SocketFactory factory, int rpcTimeout)
+ Configuration conf, SocketFactory factory, int rpcTimeout, InvocationHandler handler)
throws IOException {
if (User.isSecurityEnabled()) {
HBaseSaslRpcServer.init(conf);
@@ -204,7 +204,7 @@ public class SecureRpcEngine implements
VersionedProtocol proxy =
(VersionedProtocol) Proxy.newProxyInstance(
protocol.getClassLoader(), new Class[] { protocol },
- new Invoker(protocol, addr, ticket, conf, factory, rpcTimeout));
+ handler);
long serverVersion = proxy.getProtocolVersion(protocol.getName(),
clientVersion);
if (serverVersion != clientVersion) {
@@ -214,6 +214,14 @@ public class SecureRpcEngine implements
return proxy;
}
+ public VersionedProtocol getProxy(Class<? extends VersionedProtocol> protocol,
+ long clientVersion, InetSocketAddress addr,
+ User ticket, Configuration conf,
+ SocketFactory factory, int rpcTimeout) throws IOException {
+ return getProxy(protocol, clientVersion, addr, ticket, conf, factory, rpcTimeout,
+ new Invoker(protocol, addr, ticket, conf, factory, rpcTimeout));
+ }
+
/**
* Stop this proxy and release its invoker's resource
* @param proxy the proxy to be stopped