From a357a911dab460df3e1704f5e729083f28c17075 Mon Sep 17 00:00:00 2001
From: michaeloffner <michaeloffner@users.noreply.github.com>
Date: Mon, 23 Oct 2023 22:01:38 +0200
Subject: [PATCH] improve OSGi bundle loading (reduce file access)

---
 .../runtime/config/ConfigServerFactory.java   |  4 +-
 .../engine/ThreadLocalConfigServer.java       | 37 +++++++++++++++++++
 .../java/lucee/runtime/osgi/OSGiUtil.java     | 23 +++++++++---
 3 files changed, 57 insertions(+), 7 deletions(-)
 create mode 100644 core/src/main/java/lucee/runtime/engine/ThreadLocalConfigServer.java

diff --git a/core/src/main/java/lucee/runtime/config/ConfigServerFactory.java b/core/src/main/java/lucee/runtime/config/ConfigServerFactory.java
index 619897c987..55085a32e1 100644
--- a/core/src/main/java/lucee/runtime/config/ConfigServerFactory.java
+++ b/core/src/main/java/lucee/runtime/config/ConfigServerFactory.java
@@ -41,6 +41,7 @@
 import lucee.runtime.CFMLFactory;
 import lucee.runtime.converter.ConverterException;
 import lucee.runtime.engine.CFMLEngineImpl;
+import lucee.runtime.engine.ThreadLocalConfigServer;
 import lucee.runtime.engine.ThreadLocalPageContext;
 import lucee.runtime.exp.ApplicationException;
 import lucee.runtime.exp.PageException;
@@ -119,7 +120,7 @@ public static ConfigServerImpl newInstance(CFMLEngineImpl engine, Map<String, CF
 						"has " + (hasConfigOld ? "" : "no ") + "xml server context config [" + configFileOld + "]");
 			}
 			ConfigServerImpl config = existing != null ? existing : new ConfigServerImpl(engine, initContextes, contextes, configDir, configFileNew, ui, essentialOnly);
-
+			ThreadLocalConfigServer.register(config);
 			// translate to new
 			if (!hasConfigNew) {
 				if (hasConfigOld) {
@@ -164,6 +165,7 @@ public static ConfigServerImpl newInstance(CFMLEngineImpl engine, Map<String, CF
 		}
 		finally {
 			ThreadLocalPageContext.insideServerNewInstance(false);
+			ThreadLocalConfigServer.release();
 		}
 	}
 
diff --git a/core/src/main/java/lucee/runtime/engine/ThreadLocalConfigServer.java b/core/src/main/java/lucee/runtime/engine/ThreadLocalConfigServer.java
new file mode 100644
index 0000000000..70cba8bb33
--- /dev/null
+++ b/core/src/main/java/lucee/runtime/engine/ThreadLocalConfigServer.java
@@ -0,0 +1,37 @@
+package lucee.runtime.engine;
+
+import lucee.runtime.config.ConfigServer;
+
+/**
+ * class to handle thread local PageContext, do use pagecontext in classes that have no method
+ * argument pagecontext
+ */
+public final class ThreadLocalConfigServer {
+
+	private static ThreadLocal<ConfigServer> cThreadLocal = new ThreadLocal<ConfigServer>();
+
+	/**
+	 * register a Config for he current thread
+	 * 
+	 * @param config Config to register
+	 */
+	public static void register(ConfigServer config) {// DO NOT CHANGE, used in Ortus extension via reflection
+		cThreadLocal.set(config);
+	}
+
+	/**
+	 * returns Config registered for the current thread
+	 * 
+	 * @return Config for the current thread or null
+	 */
+	public static ConfigServer get() {
+		return cThreadLocal.get();
+	}
+
+	/**
+	 * release the pagecontext for the current thread
+	 */
+	public static void release() {// DO NOT CHANGE, used in Ortus extension via reflection
+		cThreadLocal.set(null);
+	}
+}
\ No newline at end of file
diff --git a/core/src/main/java/lucee/runtime/osgi/OSGiUtil.java b/core/src/main/java/lucee/runtime/osgi/OSGiUtil.java
index b3aece8bc3..ec397a8665 100644
--- a/core/src/main/java/lucee/runtime/osgi/OSGiUtil.java
+++ b/core/src/main/java/lucee/runtime/osgi/OSGiUtil.java
@@ -71,10 +71,12 @@
 import lucee.loader.osgi.BundleUtil;
 import lucee.loader.util.Util;
 import lucee.runtime.config.Config;
+import lucee.runtime.config.ConfigServer;
 import lucee.runtime.config.ConfigWebFactory;
 import lucee.runtime.config.ConfigWebUtil;
 import lucee.runtime.config.Identification;
 import lucee.runtime.engine.CFMLEngineImpl;
+import lucee.runtime.engine.ThreadLocalConfigServer;
 import lucee.runtime.engine.ThreadLocalPageContext;
 import lucee.runtime.exp.PageException;
 import lucee.runtime.op.Caster;
@@ -858,10 +860,15 @@ private static Resource downloadBundle(CFMLEngineFactory factory, final String s
 				throw re;
 			}
 		}
-		// print.e("xxxxxxxxxxxxxxxxxxxxxxx");
-		// print.e(symbolicName + ":" + symbolicVersion);
 		final Resource jarDir = ResourceUtil.toResource(factory.getBundleDirectory());
-		final URL updateProvider = factory.getUpdateLocation();
+		final URL updateProvider;
+		if (ThreadLocalPageContext.insideServerNewInstance()) {
+			ConfigServer cs = ThreadLocalConfigServer.get();
+			updateProvider = cs != null ? cs.getUpdateLocation() : factory.getUpdateLocation();
+		}
+		else {
+			updateProvider = factory.getUpdateLocation();
+		}
 
 		if (symbolicVersion == null) symbolicVersion = "latest";
 		final URL updateUrl = new URL(updateProvider, "/rest/update/provider/download/" + symbolicName + "/" + symbolicVersion + "/" + (id != null ? id.toQueryString() : "")
@@ -1097,6 +1104,7 @@ private static BundleFile _getBundleFile(CFMLEngineFactory factory, String name,
 	}
 
 	private static BundleFile _getBundleFile(CFMLEngineFactory factory, BundleRange bundleRange, List<Resource> addional, StringBuilder versionsFound) {
+
 		Resource match = null;
 		try {
 
@@ -1212,10 +1220,13 @@ private static List<Resource> createPossibleNameMatches(Resource dir, List<Resou
 		VersionRange vr = bundleRange.getVersionRange();
 		if (vr != null) {
 			VersionDefinition from = vr.getFrom();
-			if (from != null && from.op == VersionDefinition.EQ || from.op == VersionDefinition.GTE) {
+			if (from != null && from.version != null && (from.op == VersionDefinition.EQ || from.op == VersionDefinition.GTE)) {
 				String name = bundleRange.getName();
-				String[] patterns = new String[] { name + "-" + from.version + ".jar", name.replace('.', '-') + "-" + (from.version.toString().replace('.', '-')) + ".jar",
-						name.replace('-', '.') + "-" + from.version + ".jar" };
+				String regular = name + "-" + from.version + ".jar";
+				String dash = name.replace('.', '-') + "-" + (from.version.toString().replace('.', '-')) + ".jar";
+				String dot = name.replace('-', '.') + "-" + from.version + ".jar";
+
+				String[] patterns = regular.equals(dot) ? new String[] { regular, dash } : new String[] { regular, dot, dash };
 
 				for (String pattern: patterns) {
 					resources.add(dir.getRealResource(pattern));