Mercurial > hg > shenandoah-preopenjdk-archive > openjdk8 > nashorn
changeset 1101:c22dd9ae7ff0
8064789: Nashorn should just warn on code store instantiation error
Reviewed-by: attila, lagergren
author | hannesw |
---|---|
date | Fri, 21 Nov 2014 20:17:02 +0100 |
parents | fcd4684a739c |
children | c3a510b73875 |
files | src/jdk/nashorn/internal/runtime/CodeStore.java src/jdk/nashorn/internal/runtime/Context.java |
diffstat | 2 files changed, 12 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/src/jdk/nashorn/internal/runtime/CodeStore.java Thu Nov 20 11:27:48 2014 -0800 +++ b/src/jdk/nashorn/internal/runtime/CodeStore.java Fri Nov 21 20:17:02 2014 +0100 @@ -82,10 +82,9 @@ * Returns a new code store instance. * * @param context the current context - * @return The instance - * @throws IOException If an error occurs + * @return The instance, or null if code store could not be created */ - public static CodeStore newCodeStore(final Context context) throws IOException { + public static CodeStore newCodeStore(final Context context) { final Class<CodeStore> baseClass = CodeStore.class; try { // security check first @@ -103,9 +102,14 @@ } catch (final AccessControlException e) { context.getLogger(CodeStore.class).warning("failed to load code store provider ", e); } - final CodeStore store = new DirectoryCodeStore(context); - store.initLogger(context); - return store; + try { + final CodeStore store = new DirectoryCodeStore(context); + store.initLogger(context); + return store; + } catch (final IOException e) { + context.getLogger(CodeStore.class).warning("failed to create cache directory ", e); + return null; + } }
--- a/src/jdk/nashorn/internal/runtime/Context.java Thu Nov 20 11:27:48 2014 -0800 +++ b/src/jdk/nashorn/internal/runtime/Context.java Fri Nov 21 20:17:02 2014 +0100 @@ -509,11 +509,7 @@ } if (env._persistent_cache) { - try { - codeStore = newCodeStore(this); - } catch (final IOException e) { - throw new RuntimeException("Error initializing code cache", e); - } + codeStore = newCodeStore(this); } // print version info if asked. @@ -1200,7 +1196,7 @@ FunctionNode functionNode = null; // We only use the code store here if optimistic types are disabled. With optimistic types, initial compilation // just creates a thin wrapper, and actual code is stored per function in RecompilableScriptFunctionData. - final boolean useCodeStore = env._persistent_cache && !env._parse_only && !env._optimistic_types; + final boolean useCodeStore = codeStore != null && !env._parse_only && !env._optimistic_types; final String cacheKey = useCodeStore ? CodeStore.getCacheKey(0, null) : null; if (useCodeStore) {