You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by to...@apache.org on 2011/11/22 20:27:04 UTC
svn commit: r1205137 - in /hbase/branches/0.90: CHANGES.txt
src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
Author: todd
Date: Tue Nov 22 19:27:03 2011
New Revision: 1205137
URL: http://svn.apache.org/viewvc?rev=1205137&view=rev
Log:
HBASE-3952 Guava snuck back in as a dependency via HBASE-3777
Modified:
hbase/branches/0.90/CHANGES.txt
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
Modified: hbase/branches/0.90/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/CHANGES.txt?rev=1205137&r1=1205136&r2=1205137&view=diff
==============================================================================
--- hbase/branches/0.90/CHANGES.txt (original)
+++ hbase/branches/0.90/CHANGES.txt Tue Nov 22 19:27:03 2011
@@ -96,6 +96,7 @@ Release 0.90.5 - Unreleased
(Max Lapan)
HBASE-4827 TestAdmin should clean up resources after tests
HBASE-4848 TestScanner failing because hostname can't be null
+ HBASE-3952 Guava snuck back in as a dependency via HBASE-3777
IMPROVEMENT
HBASE-4205 Enhance HTable javadoc (Eric Charles)
Modified: hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java?rev=1205137&r1=1205136&r2=1205137&view=diff
==============================================================================
--- hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java (original)
+++ hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java Tue Nov 22 19:27:03 2011
@@ -23,6 +23,7 @@ import java.io.Closeable;
import java.io.IOException;
import java.lang.reflect.UndeclaredThrowableException;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
@@ -72,8 +73,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
@@ -357,20 +356,20 @@ 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) {
if (conf.getBoolean(HConstants.HBASE_CONNECTION_PER_CONFIG, false)) {
- builder.put(HConstants.HBASE_CLIENT_INSTANCE_ID, String.valueOf(System.identityHashCode(conf)));
+ m.put(HConstants.HBASE_CLIENT_INSTANCE_ID, String.valueOf(System.identityHashCode(conf)));
} else {
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