hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From l...@apache.org
Subject hbase git commit: NPE in RpcServer causing intermittent UT failure of TestMasterReplication#testHFileCyclicReplication
Date Fri, 08 Jul 2016 17:17:31 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-1.3 966e5f2cb -> d32230d0b


NPE in RpcServer causing intermittent UT failure of TestMasterReplication#testHFileCyclicReplication


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

Branch: refs/heads/branch-1.3
Commit: d32230d0b5a4706b625cc7ac7ee7d28f44bd7b85
Parents: 966e5f2
Author: Yu Li <liyu@apache.org>
Authored: Sat Jul 9 01:05:10 2016 +0800
Committer: Yu Li <liyu@apache.org>
Committed: Sat Jul 9 01:16:26 2016 +0800

----------------------------------------------------------------------
 .../src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/d32230d0/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java
index 02fe1df..404f2ec 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java
@@ -2298,7 +2298,13 @@ public class RpcServer implements RpcServerInterface, ConfigurationObserver
{
       // The above callBlockingMethod will always return a SE.  Strip the SE wrapper before
       // putting it on the wire.  Its needed to adhere to the pb Service Interface but we
don't
       // need to pass it over the wire.
-      if (e instanceof ServiceException) e = e.getCause();
+      if (e instanceof ServiceException) {
+        if (e.getCause() == null) {
+          LOG.debug("Caught a ServiceException with null cause", e);
+        } else {
+          e = e.getCause();
+        }
+      }
 
       // increment the number of requests that were exceptions.
       metrics.exception(e);


Mime
View raw message