Revert "NPE in RpcServer causing intermittent UT failure of TestMasterReplication#testHFileCyclicReplication"
This reverts commit a33097e067
.
This commit is contained in:
parent
5e0d97e0e9
commit
1578a045b6
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue