Return-Path: 
 <commits-return-13305-apmail-accumulo-commits-archive=accumulo.apache.org@accumulo.apache.org>
X-Original-To: apmail-accumulo-commits-archive@www.apache.org
Delivered-To: apmail-accumulo-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id B6F9517ED1
	for <apmail-accumulo-commits-archive@www.apache.org>;
 Fri, 10 Oct 2014 19:40:00 +0000 (UTC)
Received: (qmail 92227 invoked by uid 500); 10 Oct 2014 19:40:00 -0000
Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org
Received: (qmail 92169 invoked by uid 500); 10 Oct 2014 19:40:00 -0000
Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@accumulo.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@accumulo.apache.org>
List-Post: <mailto:commits@accumulo.apache.org>
List-Id: <commits.accumulo.apache.org>
Reply-To: dev@accumulo.apache.org
Delivered-To: mailing list commits@accumulo.apache.org
Received: (qmail 92148 invoked by uid 99); 10 Oct 2014 19:40:00 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Oct 2014 19:40:00 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 5834B81985F; Fri, 10 Oct 2014 19:40:00 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: elserj@apache.org
To: commits@accumulo.apache.org
Date: Fri, 10 Oct 2014 19:40:00 -0000
Message-Id: <12deb8fca313475396b0716d4d99560d@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [1/6] git commit: ACCUMULO-3223 Explicitly handle null from
 getOnlineTabletsForTable

Repository: accumulo
Updated Branches:
  refs/heads/1.5 e18aacda3 -> 3cce10696
  refs/heads/1.6 1b35d2633 -> a269f75ba
  refs/heads/master 5640280d8 -> 1c657edf8


ACCUMULO-3223 Explicitly handle null from getOnlineTabletsForTable


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3cce1069
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3cce1069
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3cce1069

Branch: refs/heads/1.5
Commit: 3cce10696ebaff3fd8cbb2d5cc109d43a6bf5445
Parents: e18aacd
Author: Josh Elser <elserj@apache.org>
Authored: Fri Oct 10 15:32:43 2014 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Fri Oct 10 15:32:43 2014 -0400

----------------------------------------------------------------------
 .../accumulo/server/master/balancer/DefaultLoadBalancer.java  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/3cce1069/server/src/main/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancer.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancer.java b/server/src/main/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancer.java
index 9a970e7..7d99bb7 100644
--- a/server/src/main/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancer.java
+++ b/server/src/main/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancer.java
@@ -228,7 +228,12 @@ public class DefaultLoadBalancer extends TabletBalancer {
       try {
         if (onlineTabletsForTable == null) {
           onlineTabletsForTable = new HashMap<KeyExtent,TabletStats>();
-          for (TabletStats stat : getOnlineTabletsForTable(tooMuch.server, table))
+          List<TabletStats> stats = getOnlineTabletsForTable(tooMuch.server, table);
+          if (null == stats) {
+            log.warn("Unable to find tablets to move");
+            return result;
+          }
+          for (TabletStats stat : stats)
             onlineTabletsForTable.put(new KeyExtent(stat.extent), stat);
           onlineTablets.put(table, onlineTabletsForTable);
         }