HBASE-16201 NPE in RpcServer causing intermittent UT failure of TestMasterReplication#testHFileCyclicReplication

This commit is contained in:
Yu Li 2016-07-09 01:05:10 +08:00
parent 44d2a9bc1c
commit 09d9dc4b59

View File

@ -2298,7 +2298,13 @@ 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) 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);