accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [5/9] accumulo git commit: ACCUMULO-3878 Add a missing list delimiter
Date Mon, 01 Jun 2015 19:40:59 GMT
ACCUMULO-3878 Add a missing list delimiter


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/acb5d2e2
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/acb5d2e2
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/acb5d2e2

Branch: refs/heads/1.7
Commit: acb5d2e2bed89db4d0b294e987cde18d1689fd12
Parents: a31ada5
Author: Josh Elser <elserj@apache.org>
Authored: Mon Jun 1 14:47:54 2015 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Mon Jun 1 15:38:46 2015 -0400

----------------------------------------------------------------------
 .../minicluster/impl/MiniAccumuloClusterImpl.java         | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/acb5d2e2/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
----------------------------------------------------------------------
diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
index 2e631b8..5ca0429 100644
--- a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
+++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
@@ -90,6 +90,7 @@ import org.apache.accumulo.server.util.time.SimpleTimer;
 import org.apache.accumulo.server.zookeeper.ZooReaderWriterFactory;
 import org.apache.accumulo.start.Main;
 import org.apache.accumulo.start.classloader.vfs.MiniDFSUtil;
+import org.apache.commons.configuration.AbstractConfiguration;
 import org.apache.commons.configuration.MapConfiguration;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.vfs2.FileObject;
@@ -728,8 +729,13 @@ public class MiniAccumuloClusterImpl implements AccumuloCluster {
 
   @Override
   public ClientConfiguration getClientConfig() {
-    return new ClientConfiguration(Arrays.asList(new MapConfiguration(config.getSiteConfig()))).withInstance(this.getInstanceName()).withZkHosts(
-        this.getZooKeepers());
+    return new ClientConfiguration(getConfigs(config)).withInstance(this.getInstanceName()).withZkHosts(this.getZooKeepers());
+  }
+
+  private static List<AbstractConfiguration> getConfigs(MiniAccumuloConfigImpl config)
{
+    MapConfiguration cfg = new MapConfiguration(config.getSiteConfig());
+    cfg.setListDelimiter('\0');
+    return Collections.<AbstractConfiguration> singletonList(cfg);
   }
 
   @Override


Mime
View raw message