diff --git a/core/src/main/java/lucee/runtime/config/ConfigWebImpl.java b/core/src/main/java/lucee/runtime/config/ConfigWebImpl.java index 5af63c4956..9a6a692d7f 100644 --- a/core/src/main/java/lucee/runtime/config/ConfigWebImpl.java +++ b/core/src/main/java/lucee/runtime/config/ConfigWebImpl.java @@ -119,7 +119,6 @@ public class ConfigWebImpl extends ConfigBase implements ConfigWebPro { private SCCWIdentificationWeb id; private Resource rootDir; private Mapping[] mappings; - private lucee.runtime.rest.Mapping[] restMappings; public ConfigWebImpl(CFMLFactoryImpl factory, ConfigServerImpl cs, ServletConfig config) { setInstance(factory, cs, config, false); @@ -376,16 +375,6 @@ public boolean passwordEqual(Password password) { return cs.passwordEqual(password); } - @Override - public lucee.runtime.rest.Mapping[] getRestMappings() { - if (restMappings == null) { - synchronized (this) { - if (restMappings == null) createRestMapping(); - } - } - return restMappings; - } - @Override public PageSource getPageSource(Mapping[] mappings, String realPath, boolean onlyTopLevel) { throw new PageRuntimeException(new DeprecatedException("method not supported")); @@ -1799,10 +1788,10 @@ public IdentificationServer getServerIdentification() { public void reload() { synchronized (this) { if (mappings != null) { + // MUST 7 is that needed? ConfigFactoryImpl.flushPageSourcePool(mappings); - // resetMappings(false);// MUST 7 iss that needed? + // resetMappings(false);// MUST 7 is that needed? } - createRestMapping(); } } @@ -1852,24 +1841,9 @@ public ConfigWebImpl resetMappings() { return this; } - private void createRestMapping() { - Map mappings = MapFactory.getConcurrentMap(); - lucee.runtime.rest.Mapping[] sm = cs.getRestMappings(); - lucee.runtime.rest.Mapping tmp; - if (sm != null) { - for (int i = 0; i < sm.length; i++) { - try { - // if (!sm[i].isHidden()) { - tmp = sm[i].duplicate(this, Boolean.TRUE); - mappings.put(tmp.getVirtual(), tmp); - // } - } - catch (Exception e) { - - } - } - } - this.restMappings = mappings.values().toArray(new lucee.runtime.rest.Mapping[mappings.size()]); + @Override + public lucee.runtime.rest.Mapping[] getRestMappings() { + return cs.getRestMappings(); } @Override diff --git a/loader/build.xml b/loader/build.xml index 4cce7123f3..e88e897745 100644 --- a/loader/build.xml +++ b/loader/build.xml @@ -2,7 +2,7 @@ - + diff --git a/loader/pom.xml b/loader/pom.xml index d7a428f06c..ce58f4d328 100644 --- a/loader/pom.xml +++ b/loader/pom.xml @@ -3,7 +3,7 @@ org.lucee lucee - 7.0.0.62-SNAPSHOT + 7.0.0.63-SNAPSHOT jar Lucee Loader Build