stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8027020: [regression] java.lang.VerifyError: Bad type on operand stack

Browse Source 
Reviewed-by: jlaskey, attila
This commit is contained in:
Athijegannathan Sundararajan 2013-10-22 22:04:46 +05:30
parent d24b73ab43
commit b9908d60b7
1 changed files with 3 additions and 17 deletions

20
nashorn/src/jdk/nashorn/internal/runtime/ScriptLoader.java

@ -52,24 +52,10 @@ final class ScriptLoader extends NashornLoader {
@Override
protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
checkPackageAccess(name);
try {
return super.loadClass(name, resolve);
} catch (final ClassNotFoundException | SecurityException e) {
// We'll get ClassNotFoundException for Nashorn 'struct' classes.
// Also, we'll get SecurityException for jdk.nashorn.internal.*
// classes. So, load these using to context's 'shared' loader.
// All these classes start with "jdk.nashorn.internal." prefix.
try {
if (name.startsWith(NASHORN_PKG_PREFIX)) {
return context.getSharedLoader().loadClass(name);
}
} catch (final ClassNotFoundException ignored) {
//ignored
}
// throw the original exception from here
throw e;
if (name.startsWith(NASHORN_PKG_PREFIX)) {
return context.getSharedLoader().loadClass(name);
}
return super.loadClass(name, resolve);
}
// package-private and private stuff below this point