Apache/hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-3592 Guava snuck back in as a dependency via hbase-3777

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1131294 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2011-06-03 23:49:38 +00:00
parent 83a0da24d7
commit 45fd021b2e
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -238,6 +238,7 @@ Release 0.91.0 - Unreleased
(Adam Worthington) (Adam Worthington)
HBASE-2556 Add convenience method to HBaseAdmin to get a collection of HBASE-2556 Add convenience method to HBaseAdmin to get a collection of
HRegionInfo objects for each table (Ming Ma) HRegionInfo objects for each table (Ming Ma)
HBASE-3592 Guava snuck back in as a dependency via hbase-3777
TASKS TASKS
HBASE-3559 Move report of split to master OFF the heartbeat channel HBASE-3559 Move report of split to master OFF the heartbeat channel

9
src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
View File

@ -25,6 +25,7 @@ import java.lang.reflect.Proxy;
import java.lang.reflect.UndeclaredThrowableException; import java.lang.reflect.UndeclaredThrowableException;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
@ -81,8 +82,6 @@ import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher;
import org.apache.hadoop.ipc.RemoteException; import org.apache.hadoop.ipc.RemoteException;
import org.apache.zookeeper.KeeperException; import org.apache.zookeeper.KeeperException;
import com.google.common.collect.ImmutableMap;
/** /**
* A non-instantiable class that manages {@link HConnection}s. * A non-instantiable class that manages {@link HConnection}s.
* This class has a static Map of {@link HConnection} instances keyed by * This class has a static Map of {@link HConnection} instances keyed by
@ -362,16 +361,16 @@ public class HConnectionManager {
private Map<String, String> properties; private Map<String, String> properties;
public HConnectionKey(Configuration conf) { public HConnectionKey(Configuration conf) {
ImmutableMap.Builder<String, String> builder = ImmutableMap.builder(); Map<String, String> m = new HashMap<String, String>();
if (conf != null) { if (conf != null) {
for (String property : CONNECTION_PROPERTIES) { for (String property : CONNECTION_PROPERTIES) {
String value = conf.get(property); String value = conf.get(property);
if (value != null) { if (value != null) {
builder.put(property, value); m.put(property, value);
} }
} }
} }
this.properties = builder.build(); this.properties = Collections.unmodifiableMap(m);
} }
@Override @Override