git commit: ACCUMULO-2824 OperationsImpl#getDiskUsage() should check pair against null in catch clause

[busbey]

Repository: accumulo
Updated Branches:
  refs/heads/1.6.1-SNAPSHOT 0af288391 -> b369585f5


ACCUMULO-2824 OperationsImpl#getDiskUsage() should check pair against null in 
catch clause

{code}
      } catch (TTransportException e) {
        // some sort of communication error occurred, retry
        log.debug("disk usage request failed " + pair.getFirst() + ", retrying 
... ", e);
{code}
pair should be checked against null in the above catch clause.


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

Branch: refs/heads/1.6.1-SNAPSHOT
Commit: b369585f514a92b92ab79bca211b0c31688a8e4b
Parents: 0af2883
Author: David Protzman <dmp250...@gmail.com>
Authored: Thu Jun 12 19:30:08 2014 -0400
Committer: Sean Busbey <bus...@cloudera.com>
Committed: Thu Jun 12 19:47:13 2014 -0400

----------------------------------------------------------------------
 .../apache/accumulo/core/client/impl/TableOperationsImpl.java  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/b369585f/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
----------------------------------------------------------------------
diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
 
b/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
index cd49986..2792bcc 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
@@ -1419,7 +1419,11 @@ public class TableOperationsImpl extends 
TableOperationsHelper {
         throw new AccumuloSecurityException(e.getUser(), e.getCode());
       } catch (TTransportException e) {
         // some sort of communication error occurred, retry
-        log.debug("disk usage request failed " + pair.getFirst() + ", retrying 
... ", e);
+       if (pair == null) {
+          log.debug("Disk usage request failed.  Pair is null.  Retrying 
request...", e);
+       } else {
+          log.debug("Disk usage request failed " + pair.getFirst() + ", 
retrying ... ", e);
+       }
         UtilWaitThread.sleep(100);
       } catch (TException e) {
         // may be a TApplicationException which indicates error on the server 
side