You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2016/07/22 00:40:46 UTC
hbase git commit: HBASE-16201 NPE in RpcServer causing intermittent
UT failure of TestMasterReplication#testHFileCyclicReplication
Repository: hbase
Updated Branches:
refs/heads/0.98 9f2bd55d7 -> 33d64e021
HBASE-16201 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/33d64e02
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/33d64e02
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/33d64e02
Branch: refs/heads/0.98
Commit: 33d64e021a211a47a63327d435b2e8cb58f0a223
Parents: 9f2bd55
Author: Yu Li <li...@apache.org>
Authored: Sat Jul 9 01:05:10 2016 +0800
Committer: Andrew Purtell <ap...@apache.org>
Committed: Thu Jul 21 17:38:28 2016 -0700
----------------------------------------------------------------------
.../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/33d64e02/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 b3e9103..50e16c0 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
@@ -2228,7 +2228,13 @@ public class RpcServer implements RpcServerInterface {
// 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);