Skip to content

Commit

Permalink
Merge branch '6.2' into 7.0
Browse files Browse the repository at this point in the history
# Conflicts:
#	core/src/main/java/lucee/runtime/PageSourceImpl.java
#	core/src/main/java/lucee/runtime/config/ConfigFactory.java
#	core/src/main/java/lucee/runtime/config/ConfigImpl.java
#	core/src/main/java/lucee/runtime/config/ConfigWebFactory.java
#	core/src/main/java/lucee/runtime/thread/ThreadUtil.java
#	loader/build.xml
#	loader/pom.xml
#	loader/src/main/java/lucee/loader/engine/CFMLEngineFactory.java
  • Loading branch information
michaeloffner committed Dec 9, 2024
1 parent 7a2fc43 commit 548a1f0
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5,936 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3005,7 +3005,7 @@ public static void loadMonitors(ConfigImpl config, Struct root) {
try {
Class clazz = cd.getClazz();
Object obj;
ConstructorInstance constr = Reflector.getConstructorInstance(clazz, new Object[] { configServer });
ConstructorInstance constr = Reflector.getConstructorInstance(clazz, new Object[] { configServer }, false);
if (constr.getConstructor(null) != null) obj = constr.invoke();
else obj = ClassUtil.newInstance(clazz);
LogUtil.logGlobal(ThreadLocalPageContext.getConfig(configServer == null ? config : configServer), Log.LEVEL_INFO, ConfigFactoryImpl.class.getName(),
Expand Down
Loading

0 comments on commit 548a1f0

Please sign in to comment.