Repository: accumulo Updated Branches: refs/heads/1.5.2-SNAPSHOT 67bc847d7 -> 8de426270 refs/heads/1.6.1-SNAPSHOT b369585f5 -> 3d8311557
ACCUMULO-2890 Remove AccumuloNotInitializedException Signed-off-by: Bill Havanki <bhava...@cloudera.com> Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8de42627 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8de42627 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8de42627 Branch: refs/heads/1.5.2-SNAPSHOT Commit: 8de4262704be032a44b24d0030aeeee0654477cc Parents: 67bc847 Author: David S. Wang <d...@cloudera.com> Authored: Thu Jun 12 16:23:26 2014 -0700 Committer: Bill Havanki <bhava...@cloudera.com> Committed: Thu Jun 12 20:08:45 2014 -0400 ---------------------------------------------------------------------- .../org/apache/accumulo/server/client/HdfsZooInstance.java | 8 -------- .../org/apache/accumulo/server/conf/ZooConfiguration.java | 7 +------ 2 files changed, 1 insertion(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/8de42627/server/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.java ---------------------------------------------------------------------- diff --git a/server/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.java b/server/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.java index 3e0c63f..9614102 100644 --- a/server/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.java +++ b/server/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.java @@ -53,14 +53,6 @@ import org.apache.log4j.Logger; */ public class HdfsZooInstance implements Instance { - public static class AccumuloNotInitializedException extends RuntimeException { - private static final long serialVersionUID = 1L; - - public AccumuloNotInitializedException(String string) { - super(string); - } - } - private HdfsZooInstance() { AccumuloConfiguration acuConf = ServerConfiguration.getSiteConfiguration(); zooCache = new ZooCache(acuConf.get(Property.INSTANCE_ZK_HOST), (int) acuConf.getTimeInMillis(Property.INSTANCE_ZK_TIMEOUT)); http://git-wip-us.apache.org/repos/asf/accumulo/blob/8de42627/server/src/main/java/org/apache/accumulo/server/conf/ZooConfiguration.java ---------------------------------------------------------------------- diff --git a/server/src/main/java/org/apache/accumulo/server/conf/ZooConfiguration.java b/server/src/main/java/org/apache/accumulo/server/conf/ZooConfiguration.java index 15d7d8c..ed6e741 100644 --- a/server/src/main/java/org/apache/accumulo/server/conf/ZooConfiguration.java +++ b/server/src/main/java/org/apache/accumulo/server/conf/ZooConfiguration.java @@ -32,7 +32,6 @@ import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.core.zookeeper.ZooUtil; import org.apache.accumulo.fate.zookeeper.ZooCache; import org.apache.accumulo.server.ServerConstants; -import org.apache.accumulo.server.client.HdfsZooInstance.AccumuloNotInitializedException; import org.apache.log4j.Logger; public class ZooConfiguration extends AccumuloConfiguration { @@ -78,11 +77,7 @@ public class ZooConfiguration extends AccumuloConfiguration { String value = null; if (Property.isValidZooPropertyKey(key)) { - try { - value = get(key); - } catch (AccumuloNotInitializedException e) { - log.warn("failed to lookup property in zookeeper: " + key, e); - } + value = get(key); } if (value == null || !property.getType().isValidFormat(value)) {
