LDEV-5014 - do "firstRun" at the end of the thread

lucee · Jul 17, 2024 · 248f577 · 248f577
1 parent 609a5a3
commit 248f577
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 20 deletions.
diff --git a/core/src/main/java/lucee/runtime/engine/Controler.java b/core/src/main/java/lucee/runtime/engine/Controler.java
@@ -211,24 +211,6 @@ private void control(CFMLFactoryImpl[] factories, boolean firstRun, Log log) {
 			if (log != null) log.error("controler", t);
 		}
 
-		if (firstRun) {
-
-			try {
-				RHExtension.correctExtensions(configServer);
-			}
-			catch (Exception e) {
-				if (log != null) log.error("controler", e);
-			}
-
-			// loading all versions from Maven (if it can be reached)
-			try {
-				new MavenUpdateProvider().list();
-			}
-			catch (Exception e) {
-				if (log != null) log.error("controler", e);
-			}
-		}
-
 		// every 10 seconds
 		if (do10Seconds) {
 			// deploy extensions, archives ...
@@ -271,6 +253,24 @@ private void control(CFMLFactoryImpl[] factories, boolean firstRun, Log log) {
 		for (int i = 0; i < factories.length; i++) {
 			control(factories[i], do10Seconds, doMinute, doHour, firstRun, log);
 		}
+
+		if (firstRun) {
+
+			try {
+				RHExtension.correctExtensions(configServer);
+			}
+			catch (Exception e) {
+				if (log != null) log.error("controler", e);
+			}
+
+			// loading all versions from Maven (if it can be reached)
+			try {
+				new MavenUpdateProvider().list();
+			}
+			catch (Exception e) {
+				if (log != null) log.error("controler", e);
+			}
+		}
 	}
 
 	private void control(CFMLFactoryImpl cfmlFactory, boolean do10Seconds, boolean doMinute, boolean doHour, boolean firstRun, Log log) {

diff --git a/loader/build.xml b/loader/build.xml
@@ -2,7 +2,7 @@
 <project default="core" basedir="." name="Lucee" 
   xmlns:resolver="antlib:org.apache.maven.resolver.ant">
 
-  <property name="version" value="6.2.0.22-SNAPSHOT"/>
+  <property name="version" value="6.2.0.23-SNAPSHOT"/>
 
   <taskdef uri="antlib:org.apache.maven.resolver.ant" resource="org/apache/maven/resolver/ant/antlib.xml">
     <classpath>

diff --git a/loader/pom.xml b/loader/pom.xml
@@ -3,7 +3,7 @@
 
   <groupId>org.lucee</groupId>
   <artifactId>lucee</artifactId>
-  <version>6.2.0.22-SNAPSHOT</version>
+  <version>6.2.0.23-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Lucee Loader Build</name>