ACCUMULO-527 Fix indentation in Shell from last commit Signed-off-by: Keith Turner <[email protected]>
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5b322dfc Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5b322dfc Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5b322dfc Branch: refs/heads/master Commit: 5b322dfce166a1748898c7c7c7fb54fa4ade2e50 Parents: 7ba6f8d Author: Bill Havanki <[email protected]> Authored: Thu Sep 19 14:18:58 2013 -0400 Committer: Keith Turner <[email protected]> Committed: Thu Sep 19 14:43:14 2013 -0400 ---------------------------------------------------------------------- .../main/java/org/apache/accumulo/core/util/shell/Shell.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/5b322dfc/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java b/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java index 1c996f3..4140c8c 100644 --- a/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java +++ b/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java @@ -389,11 +389,11 @@ public class Shell extends ShellOptions { String instanceName, hosts; if (options.isHdfsZooInstance()) { instanceName = hosts = null; - } else if (options.getZooKeeperInstance().size() > 0) { - List<String> zkOpts = options.getZooKeeperInstance(); + } else if (options.getZooKeeperInstance().size() > 0) { + List<String> zkOpts = options.getZooKeeperInstance(); instanceName = zkOpts.get(0); hosts = zkOpts.get(1); - } else { + } else { instanceName = options.getZooKeeperInstanceName(); hosts = options.getZooKeeperHosts(); } @@ -407,7 +407,7 @@ public class Shell extends ShellOptions { @SuppressWarnings("deprecation") AccumuloConfiguration conf = AccumuloConfiguration.getSiteConfiguration(); if (instanceName == null) { - Path instanceDir = new Path(conf.get(Property.INSTANCE_DFS_DIR), "instance_id"); + Path instanceDir = new Path(conf.get(Property.INSTANCE_DFS_DIR), "instance_id"); instanceId = UUID.fromString(ZooUtil.getInstanceIDFromHdfs(instanceDir)); } if (keepers == null) {
