Author: vines
Date: Thu May 30 15:08:12 2013
New Revision: 1487885
URL: http://svn.apache.org/r1487885
Log:
ACCUMULO-1474 - merging to trunk
Modified:
accumulo/trunk/ (props changed)
accumulo/trunk/core/ (props changed)
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mock/MockTable.java
Propchange: accumulo/trunk/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5:r1487883
Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/core:r1487883
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mock/MockTable.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mock/MockTable.java?rev=1487885&r1=1487884&r2=1487885&view=diff
==============================================================================
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mock/MockTable.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mock/MockTable.java
Thu May 30 15:08:12 2013
@@ -20,13 +20,13 @@ import java.util.Collection;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.Map;
-import java.util.Set;
import java.util.Map.Entry;
+import java.util.Set;
import java.util.SortedMap;
import java.util.SortedSet;
import java.util.TreeMap;
-import java.util.TreeSet;
import java.util.concurrent.ConcurrentSkipListMap;
+import java.util.concurrent.ConcurrentSkipListSet;
import org.apache.accumulo.core.client.admin.TimeType;
import org.apache.accumulo.core.conf.AccumuloConfiguration;
@@ -87,7 +87,7 @@ public class MockTable {
final Map<String,String> settings;
Map<String,EnumSet<TablePermission>> userPermissions = new
HashMap<String,EnumSet<TablePermission>>();
private TimeType timeType;
- SortedSet<Text> splits = new TreeSet<Text>();
+ SortedSet<Text> splits = new ConcurrentSkipListSet<Text>();
Map<String,Set<Text>> localityGroups = new TreeMap<String, Set<Text>>();
MockTable(boolean limitVersion, TimeType timeType) {
