Revert "NPE in RpcServer causing intermittent UT failure of TestMasterReplication#testHFileCyclicReplication"
This reverts commit a33097e067b73be8e877b822afa90b89a0c7974f. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/1578a045 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/1578a045 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/1578a045 Branch: refs/heads/HBASE-14850 Commit: 1578a045b6af6e8cd4c85d7b43397e204345a99d Parents: 5e0d97e Author: Yu Li <[email protected]> Authored: Sat Jul 9 02:01:43 2016 +0800 Committer: Yu Li <[email protected]> Committed: Sat Jul 9 02:01:43 2016 +0800 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/1578a045/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 73226aa..ad88e8e 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 @@ -2246,13 +2246,7 @@ 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) { - if (e.getCause() == null) { - LOG.debug("Caught a ServiceException with null cause", e); - } else { - e = e.getCause(); - } - } + if (e instanceof ServiceException) e = e.getCause(); // increment the number of requests that were exceptions. metrics.exception(e);
