Author: wheat9
Date: Wed Mar 5 23:12:22 2014
New Revision: 1574717
URL: http://svn.apache.org/r1574717
Log:
Merge r1574716 from trunk.
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/ConfiguredFailoverProxyProvider.java
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/ConfiguredFailoverProxyProvider.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/ConfiguredFailoverProxyProvider.java?rev=1574717&r1=1574716&r2=1574717&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/ConfiguredFailoverProxyProvider.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/ConfiguredFailoverProxyProvider.java
Wed Mar 5 23:12:22 2014
@@ -116,10 +116,9 @@ public class ConfiguredFailoverProxyProv
/**
* Lazily initialize the RPC proxy object.
*/
- @SuppressWarnings("unchecked")
@Override
- public synchronized T getProxy() {
- AddressRpcProxyPair current = proxies.get(currentProxyIndex);
+ public synchronized ProxyInfo<T> getProxy() {
+ AddressRpcProxyPair<T> current = proxies.get(currentProxyIndex);
if (current.namenode == null) {
try {
current.namenode = NameNodeProxies.createNonHAProxy(conf,
@@ -129,7 +128,7 @@ public class ConfiguredFailoverProxyProv
throw new RuntimeException(e);
}
}
- return (T)current.namenode;
+ return new ProxyInfo<T>((T)current.namenode, current.address.toString());
}
@Override
