Author: reschke
Date: Thu Jun 18 14:29:49 2015
New Revision: 1686234
URL: http://svn.apache.org/r1686234
Log:
OAK-1266 - RDBHelper: un-hardwire set of DocumentStore table names (fixed)
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java?rev=1686234&r1=1686233&r2=1686234&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
Thu Jun 18 14:29:49 2015
@@ -72,8 +72,6 @@ import org.apache.jackrabbit.oak.plugins
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import aQute.lib.collections.SortedList;
-
import com.google.common.base.Objects;
import com.google.common.cache.Cache;
import com.google.common.collect.ImmutableMap;
@@ -330,7 +328,9 @@ public class RDBDocumentStore implements
tmp.put(Collection.NODES, "NODES");
tmp.put(Collection.SETTINGS, "SETTINGS");
TABLEMAP = Collections.unmodifiableMap(tmp);
- TABLENAMES = Collections.unmodifiableList(new
SortedList<String>(TABLEMAP.values()));
+ List<String> tl = new ArrayList<String>(TABLEMAP.values());
+ Collections.sort(tl);
+ TABLENAMES = Collections.unmodifiableList(tl);
}
public static List<String> getTableNames() {
