diff --git a/core/src/main/java/lucee/runtime/cache/ram/RamCache.java b/core/src/main/java/lucee/runtime/cache/ram/RamCache.java index 104ccd41e5..b068f937d4 100755 --- a/core/src/main/java/lucee/runtime/cache/ram/RamCache.java +++ b/core/src/main/java/lucee/runtime/cache/ram/RamCache.java @@ -83,9 +83,6 @@ public RamCache() { } } - public static void init(Config config, String[] cacheNames, Struct[] arguments) {// print.ds(); - } - @Override public void init(Config config, String cacheName, Struct arguments) throws IOException { // RamCache is also used without calling init, because of that we have this test in constructor and diff --git a/core/src/main/java/lucee/runtime/config/ConfigWebFactory.java b/core/src/main/java/lucee/runtime/config/ConfigWebFactory.java index 91fc933a75..8ed5411851 100644 --- a/core/src/main/java/lucee/runtime/config/ConfigWebFactory.java +++ b/core/src/main/java/lucee/runtime/config/ConfigWebFactory.java @@ -29,9 +29,7 @@ import java.io.PrintWriter; import java.io.UnsupportedEncodingException; import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import java.lang.reflect.Modifier; import java.net.MalformedURLException; import java.nio.charset.Charset; import java.security.NoSuchAlgorithmException; @@ -2652,36 +2650,28 @@ else if (cd.getClassName() != null } } } - // call - Iterator>> it = _caches.entrySet().iterator(); - Entry> entry; - List list; - ClassDefinition _cd; - while (it.hasNext()) { - entry = it.next(); - list = entry.getValue(); - _cd = entry.getKey(); - try { - Method m = _cd.getClazz().getMethod("init", new Class[] { Config.class, String[].class, Struct[].class }); - if (Modifier.isStatic(m.getModifiers())) m.invoke(null, new Object[] { config, _toCacheNames(list), _toArguments(list) }); - else LogUtil.logGlobal(ThreadLocalPageContext.getConfig(configServer == null ? config : configServer), Log.LEVEL_ERROR, ConfigWebFactory.class.getName(), - "method [init(Config,String[],Struct[]):void] for class [" + _cd.toString() + "] is not static"); - - } - catch (InvocationTargetException e) { - log.error("Cache", e.getTargetException()); - } - catch (RuntimeException e) { - log.error("Cache", e); - } - catch (NoSuchMethodException e) { - log.error("Cache", "missing method [public static init(Config,String[],Struct[]):void] for class [" + _cd.toString() + "] "); - } - catch (Throwable e) { - ExceptionUtil.rethrowIfNecessary(e); - log.error("Cache", e); - } - } + // call static init + // Iterator>> it = _caches.entrySet().iterator(); + // Entry> entry; + // List list; + // ClassDefinition _cd; + /* + * while (it.hasNext()) { entry = it.next(); list = entry.getValue(); _cd = entry.getKey(); + * + * try { Method m = _cd.getClazz().getMethod("init", new Class[] { Config.class, String[].class, + * Struct[].class }); if (Modifier.isStatic(m.getModifiers())) m.invoke(null, new Object[] { config, + * _toCacheNames(list), _toArguments(list) }); else + * LogUtil.logGlobal(ThreadLocalPageContext.getConfig(configServer == null ? config : configServer), + * Log.LEVEL_ERROR, ConfigWebFactory.class.getName(), + * "method [init(Config,String[],Struct[]):void] for class [" + _cd.toString() + "] is not static"); + * } catch (InvocationTargetException e) { log.error("Cache", e.getTargetException()); } catch + * (RuntimeException e) { log.error("Cache", e); } catch (NoSuchMethodException e) { + * log.error("Cache", + * "missing method [public static init(Config,String[],Struct[]):void] for class [" + _cd.toString() + * + "] "); } catch (Throwable e) { ExceptionUtil.rethrowIfNecessary(e); log.error("Cache", e); } + * + * } + */ } // Copy Parent caches as readOnly @@ -4866,7 +4856,6 @@ private static void _loadCFX(ConfigServerImpl configServer, ConfigImpl config, S private static void _loadExtensionBundles(ConfigServerImpl cs, ConfigImpl config, Struct root, Log log) { Log deployLog = config.getLog("deploy"); if (deployLog != null) log = deployLog; - try { boolean changed = false; if (config instanceof ConfigServer) { diff --git a/loader/build.xml b/loader/build.xml index 4e673bc339..fccbf2ded9 100644 --- a/loader/build.xml +++ b/loader/build.xml @@ -2,7 +2,7 @@ - + diff --git a/loader/pom.xml b/loader/pom.xml index 3568f29c40..6be215c55f 100644 --- a/loader/pom.xml +++ b/loader/pom.xml @@ -3,7 +3,7 @@ org.lucee lucee - 6.1.0.13-ALPHA + 6.1.0.14-ALPHA jar Lucee Loader Build