You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by dl...@apache.org on 2016/04/18 17:00:37 UTC
[1/2] accumulo git commit: ACCUMULO-4196: Protect against NPE
Repository: accumulo
Updated Branches:
refs/heads/master c43c7be6b -> b4037a637
ACCUMULO-4196: Protect against NPE
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/79182991
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/79182991
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/79182991
Branch: refs/heads/master
Commit: 79182991d0da0f7b7836a901cec78b3ea570808c
Parents: e77bdd7
Author: Dave Marion <dl...@apache.org>
Authored: Mon Apr 18 10:50:25 2016 -0400
Committer: Dave Marion <dl...@apache.org>
Committed: Mon Apr 18 10:50:25 2016 -0400
----------------------------------------------------------------------
.../server/master/balancer/HostRegexTableLoadBalancer.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/79182991/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 29bc1cf..d19ab82 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
@@ -320,6 +320,9 @@ public class HostRegexTableLoadBalancer extends TableLoadBalancer implements Con
}
try {
List<TabletStats> outOfBoundsTablets = getOnlineTabletsForTable(e.getKey(), tid);
+ if (null == outOfBoundsTablets) {
+ continue;
+ }
Random random = new Random();
for (TabletStats ts : outOfBoundsTablets) {
KeyExtent ke = new KeyExtent(ts.getExtent());
[2/2] accumulo git commit: Merge branch '1.7'
Posted by dl...@apache.org.
Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b4037a63
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b4037a63
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b4037a63
Branch: refs/heads/master
Commit: b4037a637a7b2c0638656457772fb9c5dd31b1c5
Parents: c43c7be 7918299
Author: Dave Marion <dl...@apache.org>
Authored: Mon Apr 18 10:50:53 2016 -0400
Committer: Dave Marion <dl...@apache.org>
Committed: Mon Apr 18 10:50:53 2016 -0400
----------------------------------------------------------------------
.../server/master/balancer/HostRegexTableLoadBalancer.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b4037a63/server/base/src/main/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancer.java
----------------------------------------------------------------------