YARN-3400. [JDK 8] Build Failure due to unreported exceptions in RPCUtil (rkanter)
This commit is contained in:
parent
3d0708bdb0
commit
87130bf6b2
@ -108,6 +108,9 @@ Release 2.8.0 - UNRELEASED
|
||||
YARN-3383. AdminService should use "warn" instead of "info" to log exception
|
||||
when operation fails. (Li Lu via wangda)
|
||||
|
||||
YARN-3400. [JDK 8] Build Failure due to unreported exceptions in
|
||||
RPCUtil (rkanter)
|
||||
|
||||
Release 2.7.0 - UNRELEASED
|
||||
|
||||
INCOMPATIBLE CHANGES
|
||||
|
@ -70,6 +70,21 @@ private static <T extends Throwable> T instantiateException(
|
||||
}
|
||||
}
|
||||
|
||||
private static <T extends YarnException> T instantiateYarnException(
|
||||
Class<? extends T> cls, RemoteException re) throws RemoteException {
|
||||
return instantiateException(cls, re);
|
||||
}
|
||||
|
||||
private static <T extends IOException> T instantiateIOException(
|
||||
Class<? extends T> cls, RemoteException re) throws RemoteException {
|
||||
return instantiateException(cls, re);
|
||||
}
|
||||
|
||||
private static <T extends RuntimeException> T instantiateRuntimeException(
|
||||
Class<? extends T> cls, RemoteException re) throws RemoteException {
|
||||
return instantiateException(cls, re);
|
||||
}
|
||||
|
||||
/**
|
||||
* Utility method that unwraps and returns appropriate exceptions.
|
||||
*
|
||||
@ -94,17 +109,17 @@ public static Void unwrapAndThrowException(ServiceException se)
|
||||
// Assume this to be a new exception type added to YARN. This isn't
|
||||
// absolutely correct since the RPC layer could add an exception as
|
||||
// well.
|
||||
throw instantiateException(YarnException.class, re);
|
||||
throw instantiateYarnException(YarnException.class, re);
|
||||
}
|
||||
|
||||
if (YarnException.class.isAssignableFrom(realClass)) {
|
||||
throw instantiateException(
|
||||
throw instantiateYarnException(
|
||||
realClass.asSubclass(YarnException.class), re);
|
||||
} else if (IOException.class.isAssignableFrom(realClass)) {
|
||||
throw instantiateException(realClass.asSubclass(IOException.class),
|
||||
throw instantiateIOException(realClass.asSubclass(IOException.class),
|
||||
re);
|
||||
} else if (RuntimeException.class.isAssignableFrom(realClass)) {
|
||||
throw instantiateException(
|
||||
throw instantiateRuntimeException(
|
||||
realClass.asSubclass(RuntimeException.class), re);
|
||||
} else {
|
||||
throw re;
|
||||
|
Loading…
Reference in New Issue
Block a user