# HG changeset patch # User Jaroslav Tulach # Date 1377763242 0 # Node ID e414f379f37829ee1699425551a6d6ac3cd94bac # Parent 65be08df3969d9fcdfc80f101b56326aa0409d72 Don't propagate non-ClassNotFoundException error from Class.forName diff -r 65be08df3969 -r e414f379f378 rt/emul/mini/src/main/java/java/lang/Class.java --- a/rt/emul/mini/src/main/java/java/lang/Class.java Thu Aug 29 07:59:21 2013 +0000 +++ b/rt/emul/mini/src/main/java/java/lang/Class.java Thu Aug 29 08:00:42 2013 +0000 @@ -155,11 +155,15 @@ } return arrType; } - Class c = loadCls(className, className.replace('.', '_')); - if (c == null) { - throw new ClassNotFoundException(className); + try { + Class c = loadCls(className, className.replace('.', '_')); + if (c == null) { + throw new ClassNotFoundException(className); + } + return c; + } catch (Throwable ex) { + throw new ClassNotFoundException(className, ex); } - return c; }