1.1 --- a/src/share/vm/prims/unsafe.cpp Fri Feb 28 09:10:55 2014 -0800 1.2 +++ b/src/share/vm/prims/unsafe.cpp Wed Feb 12 12:01:45 2014 -0800 1.3 @@ -858,6 +858,11 @@ 1.4 strcpy(buf, "java/lang/"); 1.5 strcat(buf, ename); 1.6 jclass cls = env->FindClass(buf); 1.7 + if (env->ExceptionCheck()) { 1.8 + env->ExceptionClear(); 1.9 + tty->print_cr("Unsafe: cannot throw %s because FindClass has failed", buf); 1.10 + return; 1.11 + } 1.12 char* msg = NULL; 1.13 env->ThrowNew(cls, msg); 1.14 }