diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/SerializedExceptionPBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/SerializedExceptionPBImpl.java index e683fd5..fd9e170 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/SerializedExceptionPBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/SerializedExceptionPBImpl.java @@ -158,15 +158,31 @@ private void maybeInitBuilder() { viaProto = false; } + private static T instantiateExceptionImpl( + String message, Class cls, Throwable cause) + throws NoSuchMethodException, InstantiationException, + IllegalAccessException, InvocationTargetException { + Constructor cn; + T ex = null; + cn = + cls.getConstructor(message == null ? new Class[0] + : new Class[] {String.class}); + cn.setAccessible(true); + ex = message == null ? cn.newInstance() : cn.newInstance(message); + ex.initCause(cause); + return ex; + } + private static T instantiateException( Class cls, String message, Throwable cause) { - Constructor cn; T ex = null; try { - cn = cls.getConstructor(String.class); - cn.setAccessible(true); - ex = cn.newInstance(message); - ex.initCause(cause); + // Try constructor with String argument, if it fails, try default. + try { + ex = instantiateExceptionImpl(message, cls, cause); + } catch (NoSuchMethodException e) { + ex = instantiateExceptionImpl(null, cls, cause); + } } catch (SecurityException e) { throw new YarnRuntimeException(e); } catch (NoSuchMethodException e) { diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/records/impl/pb/TestSerializedExceptionPBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/records/impl/pb/TestSerializedExceptionPBImpl.java index b011e3e..ac7e40e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/records/impl/pb/TestSerializedExceptionPBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/records/impl/pb/TestSerializedExceptionPBImpl.java @@ -18,6 +18,8 @@ package org.apache.hadoop.yarn.api.records.impl.pb; +import java.nio.channels.ClosedChannelException; + import org.junit.Assert; import org.apache.hadoop.yarn.api.records.impl.pb.SerializedExceptionPBImpl; import org.apache.hadoop.yarn.exceptions.YarnRuntimeException; @@ -55,6 +57,15 @@ public void testDeserialize() throws Exception { } @Test + public void testDeserializeWithDefaultConstructor() { + // Init SerializedException with an Exception with default constructor. + ClosedChannelException ex = new ClosedChannelException(); + SerializedExceptionPBImpl pb = new SerializedExceptionPBImpl(); + pb.init(ex); + Assert.assertEquals(ex.getClass(), pb.deSerialize().getClass()); + } + + @Test public void testBeforeInit() throws Exception { SerializedExceptionProto defaultProto = SerializedExceptionProto.newBuilder().build();