back port performance improvement on felix cache from 7 to 6

lucee · Dec 15, 2024 · 0983627 · 0983627
1 parent 381f003
commit 0983627
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 13 deletions.
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.216-SNAPSHOT"/>
+  <property name="version" value="6.2.0.217-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.216-SNAPSHOT</version>
+  <version>6.2.0.217-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Lucee Loader Build</name>

diff --git a/loader/src/main/java/lucee/loader/engine/CFMLEngineFactory.java b/loader/src/main/java/lucee/loader/engine/CFMLEngineFactory.java
@@ -288,17 +288,6 @@ public void shutdownFelix() throws BundleException {
 
 		BundleCollection bc = singelton.getBundleCollection();
 		if (bc == null || bc.felix == null) return;
-
-		// stop
-		BundleLoader.removeBundles(bc);
-
-		// we give it some time
-		try {
-			Thread.sleep(5000);
-		}
-		catch (InterruptedException e) {
-		}
-
 		BundleUtil.stop(felix, false);
 	}