Repository: hbase Updated Branches: refs/heads/branch-1.2 49622cb7b -> b99efe65e
Revert "NPE in RpcServer causing intermittent UT failure of TestMasterReplication#testHFileCyclicReplication" This reverts commit 49622cb7bbd4382c1ac9397a0158f7d7e85ec97f. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/b182030d Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/b182030d Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/b182030d Branch: refs/heads/branch-1.2 Commit: b182030d48dcc89d8c26b98f2a58d7909957ea49 Parents: 49622cb Author: Yu Li <[email protected]> Authored: Sat Jul 9 02:36:48 2016 +0800 Committer: Yu Li <[email protected]> Committed: Sat Jul 9 02:36:48 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/b182030d/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 ddecc64..b9b4e7a 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 @@ -2212,13 +2212,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);
