LDEV-5099 - centralize getting pagecontext id and use parent pagecont…

…ext id if there is no pagecontext
lucee · Oct 8, 2024 · e5fba89 · e5fba89
1 parent 0b51e1b
commit e5fba89
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 27 deletions.
diff --git a/core/src/main/java/lucee/runtime/engine/ThreadLocalPageContext.java b/core/src/main/java/lucee/runtime/engine/ThreadLocalPageContext.java
@@ -317,6 +317,23 @@ public static TimeZone getTimeZone() {
 		return getTimeZone((PageContext) null);
 	}
 
+	public static int getId() {
+		PageContext pc = pcThreadLocal.get();
+		if (pc != null) return pc.getId();
+
+		// pc from parent thread
+		pc = pcThreadLocalInheritable.get();
+		if (pc != null) return pc.getId();
+
+		return 0;
+	}
+
+	public static int getId(PageContext pc) {
+		// pc provided
+		if (pc != null) return pc.getId();
+		return getId();
+	}
+
 	public static PageContext get(PageContext pc) {
 		if (pc == null) return get();
 		return pc;

diff --git a/core/src/main/java/lucee/runtime/type/QueryColumnImpl.java b/core/src/main/java/lucee/runtime/type/QueryColumnImpl.java
@@ -524,52 +524,52 @@ public Object getParent() {
 
 	@Override
 	public String castToString() throws PageException {
-		return Caster.toString(get(query.getCurrentrow(ThreadLocalPageContext.get().getId()), null));
+		return Caster.toString(get(query.getCurrentrow(ThreadLocalPageContext.getId()), null));
 	}
 
 	@Override
 	public String castToString(String defaultValue) {
 		Object _null = NullSupportHelper.NULL();
-		Object value = get(query.getCurrentrow(ThreadLocalPageContext.get().getId()), _null);
+		Object value = get(query.getCurrentrow(ThreadLocalPageContext.getId()), _null);
 		if (value == _null) return defaultValue;
 		return Caster.toString(value, defaultValue);
 	}
 
 	@Override
 	public boolean castToBooleanValue() throws PageException {
-		return Caster.toBooleanValue(get(query.getCurrentrow(ThreadLocalPageContext.get().getId()), null));
+		return Caster.toBooleanValue(get(query.getCurrentrow(ThreadLocalPageContext.getId()), null));
 	}
 
 	@Override
 	public Boolean castToBoolean(Boolean defaultValue) {
 		Object _null = NullSupportHelper.NULL();
-		Object value = get(query.getCurrentrow(ThreadLocalPageContext.get().getId()), _null);
+		Object value = get(query.getCurrentrow(ThreadLocalPageContext.getId()), _null);
 		if (value == _null) return defaultValue;
 		return Caster.toBoolean(value, defaultValue);
 	}
 
 	@Override
 	public double castToDoubleValue() throws PageException {
-		return Caster.toDoubleValue(get(query.getCurrentrow(ThreadLocalPageContext.get().getId()), null));
+		return Caster.toDoubleValue(get(query.getCurrentrow(ThreadLocalPageContext.getId()), null));
 	}
 
 	@Override
 	public double castToDoubleValue(double defaultValue) {
 		Object _null = NullSupportHelper.NULL();
-		Object value = get(query.getCurrentrow(ThreadLocalPageContext.get().getId()), _null);
+		Object value = get(query.getCurrentrow(ThreadLocalPageContext.getId()), _null);
 		if (value == _null) return defaultValue;
 		return Caster.toDoubleValue(value, true, defaultValue);
 	}
 
 	@Override
 	public DateTime castToDateTime() throws PageException {
-		return DateCaster.toDateAdvanced(get(query.getCurrentrow(ThreadLocalPageContext.get().getId()), null), null);
+		return DateCaster.toDateAdvanced(get(query.getCurrentrow(ThreadLocalPageContext.getId()), null), null);
 	}
 
 	@Override
 	public DateTime castToDateTime(DateTime defaultValue) {
 		Object _null = NullSupportHelper.NULL();
-		Object value = get(query.getCurrentrow(ThreadLocalPageContext.get().getId()), _null);
+		Object value = get(query.getCurrentrow(ThreadLocalPageContext.getId()), _null);
 		if (value == _null) return defaultValue;
 		return DateCaster.toDateAdvanced(value, DateCaster.CONVERTING_TYPE_OFFSET, null, defaultValue);
 	}
@@ -643,7 +643,7 @@ protected void populate(QueryColumnImpl trg, boolean deepCopy) {
 	@Override
 	public String toString() {
 		try {
-			return Caster.toString(get(query.getCurrentrow(ThreadLocalPageContext.get().getId()), null));
+			return Caster.toString(get(query.getCurrentrow(ThreadLocalPageContext.getId()), null));
 		}
 		catch (PageException e) {
 			return super.toString();

diff --git a/core/src/main/java/lucee/runtime/type/QueryColumnRef.java b/core/src/main/java/lucee/runtime/type/QueryColumnRef.java
@@ -181,12 +181,12 @@ public Object get(Collection.Key key) throws PageException {
 
 	@Override
 	public Object get(String key, Object defaultValue) {
-		return get(Caster.toIntValue(key, query.getCurrentrow(ThreadLocalPageContext.get().getId())), defaultValue);
+		return get(Caster.toIntValue(key, query.getCurrentrow(ThreadLocalPageContext.getId())), defaultValue);
 	}
 
 	@Override
 	public Object get(Collection.Key key, Object defaultValue) {
-		return get(Caster.toIntValue(key, query.getCurrentrow(ThreadLocalPageContext.get().getId())), defaultValue);
+		return get(Caster.toIntValue(key, query.getCurrentrow(ThreadLocalPageContext.getId())), defaultValue);
 	}
 
 	@Override
@@ -201,12 +201,12 @@ public Object set(Collection.Key key, Object value) throws PageException {
 
 	@Override
 	public Object setEL(String key, Object value) {
-		return setEL(Caster.toIntValue(key, query.getCurrentrow(ThreadLocalPageContext.get().getId())), value);
+		return setEL(Caster.toIntValue(key, query.getCurrentrow(ThreadLocalPageContext.getId())), value);
 	}
 
 	@Override
 	public Object setEL(Collection.Key key, Object value) {
-		return setEL(Caster.toIntValue(key, query.getCurrentrow(ThreadLocalPageContext.get().getId())), value);
+		return setEL(Caster.toIntValue(key, query.getCurrentrow(ThreadLocalPageContext.getId())), value);
 	}
 
 	@Override
@@ -248,52 +248,52 @@ public DumpData toDumpData(PageContext pageContext, int maxlevel, DumpProperties
 
 	@Override
 	public String castToString() throws PageException {
-		return Caster.toString(get(query.getCurrentrow(ThreadLocalPageContext.get().getId())));
+		return Caster.toString(get(query.getCurrentrow(ThreadLocalPageContext.getId())));
 	}
 
 	@Override
 	public String castToString(String defaultValue) {
 		Object _null = NullSupportHelper.NULL();
-		Object value = get(query.getCurrentrow(ThreadLocalPageContext.get().getId()), _null);
+		Object value = get(query.getCurrentrow(ThreadLocalPageContext.getId()), _null);
 		if (value == _null) return defaultValue;
 		return Caster.toString(value, defaultValue);
 	}
 
 	@Override
 	public boolean castToBooleanValue() throws PageException {
-		return Caster.toBooleanValue(get(query.getCurrentrow(ThreadLocalPageContext.get().getId())));
+		return Caster.toBooleanValue(get(query.getCurrentrow(ThreadLocalPageContext.getId())));
 	}
 
 	@Override
 	public Boolean castToBoolean(Boolean defaultValue) {
 		Object _null = NullSupportHelper.NULL();
-		Object value = get(query.getCurrentrow(ThreadLocalPageContext.get().getId()), _null);
+		Object value = get(query.getCurrentrow(ThreadLocalPageContext.getId()), _null);
 		if (value == _null) return defaultValue;
 		return Caster.toBoolean(value, defaultValue);
 	}
 
 	@Override
 	public double castToDoubleValue() throws PageException {
-		return Caster.toDoubleValue(get(query.getCurrentrow(ThreadLocalPageContext.get().getId())));
+		return Caster.toDoubleValue(get(query.getCurrentrow(ThreadLocalPageContext.getId())));
 	}
 
 	@Override
 	public double castToDoubleValue(double defaultValue) {
 		Object _null = NullSupportHelper.NULL();
-		Object value = get(query.getCurrentrow(ThreadLocalPageContext.get().getId()), _null);
+		Object value = get(query.getCurrentrow(ThreadLocalPageContext.getId()), _null);
 		if (value == _null) return defaultValue;
 		return Caster.toDoubleValue(value, true, defaultValue);
 	}
 
 	@Override
 	public DateTime castToDateTime() throws PageException {
-		return Caster.toDate(get(query.getCurrentrow(ThreadLocalPageContext.get().getId())), null);
+		return Caster.toDate(get(query.getCurrentrow(ThreadLocalPageContext.getId())), null);
 	}
 
 	@Override
 	public DateTime castToDateTime(DateTime defaultValue) {
 		Object _null = NullSupportHelper.NULL();
-		Object value = get(query.getCurrentrow(ThreadLocalPageContext.get().getId()), _null);
+		Object value = get(query.getCurrentrow(ThreadLocalPageContext.getId()), _null);
 		if (value == _null) return defaultValue;
 		return DateCaster.toDateAdvanced(value, DateCaster.CONVERTING_TYPE_OFFSET, null, defaultValue);
 	}

diff --git a/core/src/main/java/lucee/runtime/type/QueryImpl.java b/core/src/main/java/lucee/runtime/type/QueryImpl.java
@@ -2644,7 +2644,7 @@ public void insertRow() throws SQLException {
 
 	@Override
 	public boolean isAfterLast() throws SQLException {
-		return getCurrentrow(ThreadLocalPageContext.get().getId()) > getRecordcount();
+		return getCurrentrow(ThreadLocalPageContext.getId()) > getRecordcount();
 	}
 
 	@Override
@@ -3382,7 +3382,7 @@ public static QueryImpl cloneQuery(Query qry, boolean deepCopy) {
 
 	@Override
 	public java.util.Iterator getIterator() {
-		return new ForEachQueryIterator(null, this, ThreadLocalPageContext.get().getId());
+		return new ForEachQueryIterator(null, this, ThreadLocalPageContext.getId());
 	}
 
 	@Override

diff --git a/core/src/main/java/lucee/runtime/type/query/SimpleQuery.java b/core/src/main/java/lucee/runtime/type/query/SimpleQuery.java
@@ -2169,7 +2169,7 @@ public long getExecutionTime() {
 
 	@Override
 	public java.util.Iterator getIterator() {
-		return new ForEachQueryIterator(null, this, ThreadLocalPageContext.get().getId());
+		return new ForEachQueryIterator(null, this, ThreadLocalPageContext.getId());
 	}
 
 	@Override

diff --git a/core/src/main/java/lucee/runtime/type/trace/TOQuery.java b/core/src/main/java/lucee/runtime/type/trace/TOQuery.java
@@ -1778,7 +1778,7 @@ public long getExecutionTime() {
 	@Override
 	public java.util.Iterator getIterator() {
 		log();
-		return new ForEachQueryIterator(null, this, ThreadLocalPageContext.get().getId());
+		return new ForEachQueryIterator(null, this, ThreadLocalPageContext.getId());
 	}
 
 	@Override

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.1.1.90-SNAPSHOT"/>
+  <property name="version" value="6.1.1.91-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.1.1.90-SNAPSHOT</version>
+  <version>6.1.1.91-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Lucee Loader Build</name>