Merge branch '1.8'
diff --git a/pom.xml b/pom.xml
index 3435723..6bb4eb2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>accumulo-proxy</artifactId>
<name>Apache Accumulo Proxy</name>
diff --git a/src/main/java/org/apache/accumulo/proxy/ProxyServer.java b/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
index a62e1a1..56866c2 100644
--- a/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
+++ b/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
@@ -1472,8 +1472,8 @@
Set<String> propertiesToExclude) throws org.apache.accumulo.proxy.thrift.AccumuloException, org.apache.accumulo.proxy.thrift.AccumuloSecurityException,
org.apache.accumulo.proxy.thrift.TableNotFoundException, org.apache.accumulo.proxy.thrift.TableExistsException, TException {
try {
- propertiesToExclude = propertiesToExclude == null ? new HashSet<String>() : propertiesToExclude;
- propertiesToSet = propertiesToSet == null ? new HashMap<String,String>() : propertiesToSet;
+ propertiesToExclude = propertiesToExclude == null ? new HashSet<>() : propertiesToExclude;
+ propertiesToSet = propertiesToSet == null ? new HashMap<>() : propertiesToSet;
getConnector(login).tableOperations().clone(tableName, newTableName, flush, propertiesToSet, propertiesToExclude);
} catch (Exception e) {
