Repository: accumulo Updated Branches: refs/heads/1.7 3bd701b88 -> 17d26bda4 refs/heads/1.8 5a11a021f -> f289ae2ad refs/heads/master 315ccd921 -> e88cb6288
[ACCUMULO-4535] Fix NPE in HostRegexTableLoadBalancer Signed-off-by: Josh Elser <els...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/17d26bda Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/17d26bda Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/17d26bda Branch: refs/heads/1.7 Commit: 17d26bda481a5b62295d9c5f56b58680005d6b14 Parents: 3bd701b Author: Adam J. Shook <adamjsh...@gmail.com> Authored: Thu Dec 15 15:13:28 2016 -0500 Committer: Josh Elser <els...@apache.org> Committed: Wed Jan 4 11:42:10 2017 -0500 ---------------------------------------------------------------------- .../server/master/balancer/HostRegexTableLoadBalancer.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/17d26bda/server/base/src/main/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancer.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancer.java b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancer.java index 31d8c81..6b26dc4 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancer.java +++ b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancer.java @@ -39,6 +39,7 @@ import org.apache.accumulo.core.data.impl.KeyExtent; import org.apache.accumulo.core.master.thrift.TabletServerStatus; import org.apache.accumulo.core.tabletserver.thrift.TabletStats; import org.apache.accumulo.server.conf.ServerConfiguration; +import org.apache.accumulo.server.conf.ServerConfigurationFactory; import org.apache.accumulo.server.master.state.TServerInstance; import org.apache.accumulo.server.master.state.TabletMigration; import org.apache.commons.lang.builder.ToStringBuilder; @@ -254,7 +255,7 @@ public class HostRegexTableLoadBalancer extends TableLoadBalancer implements Con } @Override - public void init(ServerConfiguration conf) { + public void init(ServerConfigurationFactory conf) { super.init(conf); parseConfiguration(conf); }
