Author: stack
Date: Fri Jun 3 23:49:38 2011
New Revision: 1131294
URL: http://svn.apache.org/viewvc?rev=1131294&view=rev
Log:
HBASE-3592 Guava snuck back in as a dependency via hbase-3777
Modified:
hbase/trunk/CHANGES.txt
hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
Modified: hbase/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1131294&r1=1131293&r2=1131294&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Fri Jun 3 23:49:38 2011
@@ -238,6 +238,7 @@ Release 0.91.0 - Unreleased
(Adam Worthington)
HBASE-2556 Add convenience method to HBaseAdmin to get a collection of
HRegionInfo objects for each table (Ming Ma)
+ HBASE-3592 Guava snuck back in as a dependency via hbase-3777
TASKS
HBASE-3559 Move report of split to master OFF the heartbeat channel
Modified:
hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java?rev=1131294&r1=1131293&r2=1131294&view=diff
==============================================================================
---
hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
(original)
+++
hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
Fri Jun 3 23:49:38 2011
@@ -25,6 +25,7 @@ import java.lang.reflect.Proxy;
import java.lang.reflect.UndeclaredThrowableException;
import java.net.InetSocketAddress;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
@@ -81,8 +82,6 @@ import org.apache.hadoop.hbase.zookeeper
import org.apache.hadoop.ipc.RemoteException;
import org.apache.zookeeper.KeeperException;
-import com.google.common.collect.ImmutableMap;
-
/**
* A non-instantiable class that manages {@link HConnection}s.
* This class has a static Map of {@link HConnection} instances keyed by
@@ -362,16 +361,16 @@ public class HConnectionManager {
private Map<String, String> properties;
public HConnectionKey(Configuration conf) {
- ImmutableMap.Builder<String, String> builder = ImmutableMap.builder();
+ Map<String, String> m = new HashMap<String, String>();
if (conf != null) {
for (String property : CONNECTION_PROPERTIES) {
String value = conf.get(property);
if (value != null) {
- builder.put(property, value);
+ m.put(property, value);
}
}
}
- this.properties = builder.build();
+ this.properties = Collections.unmodifiableMap(m);
}
@Override
