Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "NPE in RpcServer causing intermittent UT failure of TestMasterReplication#testHFileCyclicReplication" 

This reverts commit a33097e067.
This commit is contained in:
Yu Li 2016-07-09 02:01:43 +08:00
parent 5e0d97e0e9
commit 1578a045b6
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java
View File

@ -2246,13 +2246,7 @@ public class RpcServer implements RpcServerInterface, ConfigurationObserver {
// The above callBlockingMethod will always return a SE. Strip the SE wrapper before // 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 // 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. // need to pass it over the wire.
if (e instanceof ServiceException) { if (e instanceof ServiceException) e = e.getCause();
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. // increment the number of requests that were exceptions.
metrics.exception(e); metrics.exception(e);