Repository: hbase Updated Branches: refs/heads/branch-1 b6d4fc955 -> 09d9dc4b5
Revert "NPE in RpcServer causing intermittent UT failure of TestMasterReplication#testHFileCyclicReplication" This reverts commit b6d4fc955fe0fc41f5225f1cc2e3e4b92029251c. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/44d2a9bc Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/44d2a9bc Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/44d2a9bc Branch: refs/heads/branch-1 Commit: 44d2a9bc1c88f6eb8cf45c9b8a4c37268d540694 Parents: b6d4fc9 Author: Yu Li <[email protected]> Authored: Sat Jul 9 02:04:01 2016 +0800 Committer: Yu Li <[email protected]> Committed: Sat Jul 9 02:04:01 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/44d2a9bc/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 404f2ec..02fe1df 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,13 +2298,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);
