提交 4665043f 编写于 作者: M malenkov

6351692: catch(Throwable) in java.beans.MetaData preventing thread shutdown

Reviewed-by: peterz, loneid
上级 961b7f16
...@@ -298,7 +298,7 @@ public class DefaultPersistenceDelegate extends PersistenceDelegate { ...@@ -298,7 +298,7 @@ public class DefaultPersistenceDelegate extends PersistenceDelegate {
oldL = (EventListener[])MethodUtil.invoke(m, oldInstance, new Object[]{}); oldL = (EventListener[])MethodUtil.invoke(m, oldInstance, new Object[]{});
newL = (EventListener[])MethodUtil.invoke(m, newInstance, new Object[]{}); newL = (EventListener[])MethodUtil.invoke(m, newInstance, new Object[]{});
} }
catch (Throwable e2) { catch (Exception e2) {
try { try {
Method m = type.getMethod("getListeners", new Class[]{Class.class}); Method m = type.getMethod("getListeners", new Class[]{Class.class});
oldL = (EventListener[])MethodUtil.invoke(m, oldInstance, new Object[]{listenerType}); oldL = (EventListener[])MethodUtil.invoke(m, oldInstance, new Object[]{listenerType});
......
...@@ -404,7 +404,7 @@ public class EventHandler implements InvocationHandler { ...@@ -404,7 +404,7 @@ public class EventHandler implements InvocationHandler {
Object newTarget = MethodUtil.invoke(getter, target, new Object[]{}); Object newTarget = MethodUtil.invoke(getter, target, new Object[]{});
return applyGetters(newTarget, rest); return applyGetters(newTarget, rest);
} }
catch (Throwable e) { catch (Exception e) {
throw new RuntimeException("Failed to call method: " + first + throw new RuntimeException("Failed to call method: " + first +
" on " + target, e); " on " + target, e);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册