Skip to content

Commit 18a3beb

Browse files
committed
[refactor] Set the default to eagerly load modules to preserve backwards compatibility
1 parent 1ffdb6f commit 18a3beb

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

exist-core/src/main/java/org/exist/util/Configuration.java

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -472,13 +472,16 @@ private void loadModuleClasses( Element xquery, Map<String, Class<?>> eagerModul
472472
final Class<?> moduleClass = lookupModuleClass(uri, clazz);
473473

474474
// Store class if the module class actually exists
475-
if(moduleClass != null && (load == null || BUILT_IN_MODULE_LOAD_ATTRIBUTE_VALUE_EAGER.equals(load))) {
476-
eagerModuleClassMap.put(uri, moduleClass);
477-
} else if(moduleClass != null) {
478-
lazyModuleClassMap.put(uri, moduleClass);
479-
}
480-
if(LOG.isDebugEnabled()) {
481-
LOG.debug("Configured module '{}' implemented in '{}'", uri, clazz);
475+
if (moduleClass != null) {
476+
if (XQueryContext.BUILT_IN_MODULE_LOAD_ATTRIBUTE_VALUE_LAZY.equals(load)) {
477+
lazyModuleClassMap.put(uri, moduleClass);
478+
} else {
479+
eagerModuleClassMap.put(uri, moduleClass);
480+
}
481+
482+
if (LOG.isDebugEnabled()) {
483+
LOG.debug("Configured module '{}' implemented in '{}'", uri, clazz);
484+
}
482485
}
483486
}
484487

0 commit comments

Comments
 (0)