From 15aaec0a67c229cd4b5d71b83369368a624736cc Mon Sep 17 00:00:00 2001
From: Jean-Daniel Cryans <jdcryans@apache.org>
Date: Mon, 22 Dec 2008 13:37:35 +0000
Subject: [PATCH] HBASE-1079  Dumb NPE in ServerCallable hides the
 RetriesExhausted exception

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/branches/0.18@728689 13f79535-47bb-0310-9956-ffa450edef68
---
 CHANGES.txt                                                 | 1 +
 src/java/org/apache/hadoop/hbase/client/ServerCallable.java | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 396098cbd79..05e4b0b3508 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -11,6 +11,7 @@ Release 0.18.2 - Unreleased
    HBASE-981   hbase.io.index.interval doesn't seem to have an effect;
                interval is 128 rather than the configured 32
    HBASE-1070  Up default index interval in TRUNK and branch
+   HBASE-1079  Dumb NPE in ServerCallable hides the RetriesExhausted exception
 
   IMPROVEMENTS
    HBASE-1046  Narrow getClosestRowBefore by passing column family (backport)
diff --git a/src/java/org/apache/hadoop/hbase/client/ServerCallable.java b/src/java/org/apache/hadoop/hbase/client/ServerCallable.java
index ab5fe6b4cb4..cc777aa4afc 100644
--- a/src/java/org/apache/hadoop/hbase/client/ServerCallable.java
+++ b/src/java/org/apache/hadoop/hbase/client/ServerCallable.java
@@ -68,6 +68,9 @@ public abstract class ServerCallable<T> implements Callable<T> {
   
   /** @return the region name */
   public byte[] getRegionName() {
+    if (location == null) {
+      return null;
+    }
     return location.getRegionInfo().getRegionName();
   }
   
@@ -75,4 +78,4 @@ public abstract class ServerCallable<T> implements Callable<T> {
   public byte [] getRow() {
     return row;
   }
-}
\ No newline at end of file
+}