change the queue type in debug pool

lucee · Sep 6, 2024 · 7b70f63 · 7b70f63
1 parent da54c86
commit 7b70f63
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 17 deletions.
diff --git a/core/src/main/java/lucee/runtime/debug/DebuggerPool.java b/core/src/main/java/lucee/runtime/debug/DebuggerPool.java
@@ -19,8 +19,10 @@
 package lucee.runtime.debug;
 
 import java.util.Iterator;
-import java.util.LinkedList;
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
 
+import lucee.commons.io.log.LogUtil;
 import lucee.commons.io.res.Resource;
 import lucee.runtime.PageContext;
 import lucee.runtime.config.ConfigWebPro;
@@ -32,43 +34,39 @@
 
 public class DebuggerPool {
 
-	// private Resource storage;
-	private LinkedList<Struct> queue = new LinkedList<Struct>();
-	// private List<Debugger> list=new ArrayList<Debugger>();
+	// private LinkedList<Struct> queue = new LinkedList<Struct>();
+	private Queue<Struct> queue = new ConcurrentLinkedQueue<>();
 
 	public DebuggerPool(Resource storage) {
 		// this.storage=storage;
 	}
 
-	public void store(PageContext pc, Debugger debugger) {
+	public void store(PageContext pc, DebuggerImpl debugger) {
 		if (ReqRspUtil.getScriptName(pc, pc.getHttpServletRequest()).indexOf("/lucee/") == 0) return;
+
 		try {
 			queue.add(debugger.getDebuggingData(pc, true));
 		}
 		catch (PageException e) {
+			LogUtil.log(pc, "debugger", e);
 		}
 
-		while (queue.size() > ((ConfigWebPro) pc.getConfig()).getDebugMaxRecordsLogged())
+		// on overflow
+		while (queue.size() > ((ConfigWebPro) pc.getConfig()).getDebugMaxRecordsLogged()) {
 			queue.poll();
-
+		}
 	}
 
 	public Array getData(PageContext pc) {
-		Iterator<Struct> it;
-		synchronized (queue) {
-			it = queue.iterator();
-		}
 		Array arr = new ArrayImpl();
+		Iterator<Struct> it = queue.iterator();
 		while (it.hasNext()) {
 			arr.appendEL(it.next());
 		}
 		return arr;
 	}
 
 	public void purge() {
-		synchronized (queue) {
-			queue.clear();
-		}
+		queue.clear();
 	}
-
 }
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.81-SNAPSHOT"/>
+  <property name="version" value="6.2.0.82-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.81-SNAPSHOT</version>
+  <version>6.2.0.82-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Lucee Loader Build</name>