Index: src/main/java/org/apache/hadoop/hbase/util/SoftValueSortedMap.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/util/SoftValueSortedMap.java (revision 1228749) +++ src/main/java/org/apache/hadoop/hbase/util/SoftValueSortedMap.java (working copy) @@ -106,9 +106,9 @@ } public V get(Object key) { - synchronized (sync) { + synchronized(sync) { checkReferences(); - SoftValue value = this.internalMap.get(key); + SoftValue value = this.internalMap.get(key); if (value == null) { return null; } @@ -121,9 +121,9 @@ } public V remove(Object key) { - synchronized (sync) { + synchronized(sync) { checkReferences(); - SoftValue value = this.internalMap.remove(key); + SoftValue value = this.internalMap.remove(key); return value == null ? null : value.get(); } } @@ -225,10 +225,10 @@ } public Collection values() { - synchronized (sync) { + synchronized(sync) { checkReferences(); ArrayList hardValues = new ArrayList(); - for (SoftValue softValue : this.internalMap.values()) { + for (SoftValue softValue : this.internalMap.values()) { hardValues.add(softValue.get()); } return hardValues; Index: src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java (revision 1228749) +++ src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java (working copy) @@ -522,9 +522,9 @@ * Map of table to table {@link HRegionLocation}s. The table key is made * by doing a {@link Bytes#mapKey(byte[])} of the table's name. */ - private final Map> + private final Map> cachedRegionLocations = - new HashMap>(); + new HashMap>(); // The presence of a server in the map implies it's likely that there is an // entry in cachedRegionLocations that map to this server; but the absence @@ -1069,7 +1069,7 @@ */ HRegionLocation getCachedLocation(final byte [] tableName, final byte [] row) { - SoftValueSortedMap tableLocations = + SortedMap tableLocations = getTableLocations(tableName); // start to examine the cache. we can only do cache actions @@ -1180,11 +1180,11 @@ * @param tableName * @return Map of cached locations for passed tableName */ - private SoftValueSortedMap getTableLocations( + private SortedMap getTableLocations( final byte [] tableName) { // find the map of cached locations for this table Integer key = Bytes.mapKey(tableName); - SoftValueSortedMap result; + SortedMap result; synchronized (this.cachedRegionLocations) { result = this.cachedRegionLocations.get(key); // if tableLocations for this table isn't built yet, make one