Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7527D1753C for ; Mon, 1 Jun 2015 19:40:56 +0000 (UTC) Received: (qmail 78492 invoked by uid 500); 1 Jun 2015 19:40:56 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 78407 invoked by uid 500); 1 Jun 2015 19:40:56 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 78312 invoked by uid 99); 1 Jun 2015 19:40:56 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Jun 2015 19:40:56 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1EFCFE0664; Mon, 1 Jun 2015 19:40:56 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: elserj@apache.org To: commits@accumulo.apache.org Date: Mon, 01 Jun 2015 19:40:59 -0000 Message-Id: <69ed0fcde630418bbe4f6ae35e2bc312@git.apache.org> In-Reply-To: <64adcbdfae724cbc80639555fcdf2e64@git.apache.org> References: <64adcbdfae724cbc80639555fcdf2e64@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [5/9] accumulo git commit: ACCUMULO-3878 Add a missing list delimiter 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 Authored: Mon Jun 1 14:47:54 2015 -0400 Committer: Josh Elser 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 getConfigs(MiniAccumuloConfigImpl config) { + MapConfiguration cfg = new MapConfiguration(config.getSiteConfig()); + cfg.setListDelimiter('\0'); + return Collections. singletonList(cfg); } @Override