Merge branch 'ACCUMULO-3176'
diff --git a/src/main/java/org/apache/accumulo/proxy/ProxyServer.java b/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
index b51d43d..b1f039c 100644
--- a/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
+++ b/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
@@ -49,6 +49,7 @@
import org.apache.accumulo.core.client.Instance;
import org.apache.accumulo.core.client.IteratorSetting;
import org.apache.accumulo.core.client.MutationsRejectedException;
+import org.apache.accumulo.core.client.NewTableConfiguration;
import org.apache.accumulo.core.client.Scanner;
import org.apache.accumulo.core.client.ScannerBase;
import org.apache.accumulo.core.client.TableExistsException;
@@ -119,7 +120,7 @@
*/
public class ProxyServer implements AccumuloProxy.Iface {
- private static final Logger logger = Logger.getLogger(ProxyServer.class);
+ public static final Logger logger = Logger.getLogger(ProxyServer.class);
protected Instance instance;
protected Class<? extends AuthenticationToken> tokenClass;
@@ -383,7 +384,10 @@
if (type == null)
type = org.apache.accumulo.proxy.thrift.TimeType.MILLIS;
- getConnector(login).tableOperations().create(tableName, versioningIter, TimeType.valueOf(type.toString()));
+ NewTableConfiguration tConfig = new NewTableConfiguration().setTimeType(TimeType.valueOf(type.toString()));
+ if (!versioningIter)
+ tConfig = tConfig.withoutDefaultIterators();
+ getConnector(login).tableOperations().create(tableName, tConfig);
} catch (TableExistsException e) {
throw new org.apache.accumulo.proxy.thrift.TableExistsException(e.toString());
} catch (Exception e) {
