Updated Branches: refs/heads/1.6.0-SNAPSHOT a9d1b13e7 -> 43bf128e4
ACCUMULO-2317 fixing shell Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/43bf128e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/43bf128e Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/43bf128e Branch: refs/heads/1.6.0-SNAPSHOT Commit: 43bf128e4393d367cdbfb5debce4de09f69bd562 Parents: 482f570 Author: John Vines <[email protected]> Authored: Tue Feb 4 13:30:21 2014 -0500 Committer: John Vines <[email protected]> Committed: Tue Feb 4 14:00:24 2014 -0500 ---------------------------------------------------------------------- core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/43bf128e/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java b/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java index 1989c18..ca126e3 100644 --- a/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java +++ b/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java @@ -222,7 +222,10 @@ public class ClientOpts extends Help { ClientConfiguration clientConfig; try { - clientConfig = new ClientConfiguration(new PropertiesConfiguration(clientConfigFile)); + if (clientConfigFile == null) + clientConfig = ClientConfiguration.loadDefault(); + else + clientConfig = new ClientConfiguration(new PropertiesConfiguration(clientConfigFile)); } catch (Exception e) { throw new IllegalArgumentException(e); }
