Merge branch '7.1' into 7.2

# Conflicts:
#	core/src/main/java/lucee/runtime/config/ConfigImpl.java
#	loader/build.xml
#	loader/pom.xml

Author: michaeloffner

core/src/main/java/lucee/runtime/CFMLFactoryImpl.java

@@ -341,8 +341,9 @@ public void checkTimeout() {
 				if (pc == null) continue;
 				long timeout = pc.getRequestTimeout();
 				Thread th;
-				// reached timeout
-				if (pc.getStartTime() + timeout < System.currentTimeMillis() && Long.MAX_VALUE != timeout) {
+				// reached timeout (adjusted for debugger suspend time)
+				long suspendedMillis = pc.getDebuggerTotalSuspendedMillis();
+				if (pc.getStartTime() + timeout + suspendedMillis < System.currentTimeMillis() && Long.MAX_VALUE != timeout) {
 					Log log = ThreadLocalPageContext.getLog(pc, "requesttimeout");
 					if (reachedConcurrentReqThreshold() && reachedMemoryThreshold() && reachedCPUThreshold()) {
 						if (log != null) {

core/src/main/java/lucee/runtime/ComponentImpl.java

@@ -145,7 +145,7 @@ public final class ComponentImpl extends StructSupport implements Externalizable
 	ComponentImpl top = this;
 	ComponentImpl base;
 	private PageSource pageSource;
-	private ComponentPageRef cpRef;
+	private ComponentPageImpl cp;
 	private ComponentScope scope;
 
 	// for all the same
@@ -179,7 +179,8 @@ public final class ComponentImpl extends StructSupport implements Externalizable
 	/**
 	 * Constructor of the Component, USED ONLY FOR DESERIALIZE
 	 */
-	public ComponentImpl() {}
+	public ComponentImpl() {
+	}
 
 	/**
 	 * constructor of the class
@@ -207,7 +208,7 @@ public ComponentImpl(ComponentPageImpl componentPage, Boolean output, boolean _s
 		this.properties = new ComponentProperties(componentPage.getComponentName(), dspName, extend.trim(), implement, hint, output, callPath + appendix, realPath,
 				componentPage.getSubname(), _synchronized, null, persistent, accessors, modifier, meta);
 
-		this.cpRef = new ComponentPageRef(componentPage);
+		this.cp = componentPage;
 		this.pageSource = componentPage.getPageSource();
 		this.importDefintions = componentPage.getImportDefintions();
 		// if(modifier!=0)
@@ -217,17 +218,11 @@ public ComponentImpl(ComponentPageImpl componentPage, Boolean output, boolean _s
 	}
 
 	public JavaSettings getJavaSettings(PageContext pc) throws IOException {
-		ComponentPageImpl cp;
-		try {
-			cp = this.cpRef.get(pc);
-		}
-		catch (PageException e) {
-			throw ExceptionUtil.toIOException(e);
-		}
-		boolean is = cp.isJavaSettingsInitialized();
+
+		boolean is = this.cp.isJavaSettingsInitialized();
 		if (!is) {
 			synchronized (cp) {
-				is = cp.isJavaSettingsInitialized();
+				is = this.cp.isJavaSettingsInitialized();
 				if (!is) {
 					boolean mergeConfig = false;
 					JavaSettings js = null;
@@ -270,18 +265,12 @@ public JavaSettings getJavaSettings(PageContext pc) throws IOException {
 					// current
 					js = JavaSettingsImpl.merge(pc.getConfig(), js, JavaSettingsImpl.readJavaSettings(pc, properties.meta));
 					if (mergeConfig) js = JavaSettingsImpl.merge(pc.getConfig(), ((ConfigPro) pc.getConfig()).getJavaSettings(), js);
-					;
 
-					return cp.setJavaSettings(js);
+					return this.cp.setJavaSettings(js);
 				}
 			}
 		}
-		return cp.getJavaSettings();
-	}
-
-	@Override
-	public final int hashCode() {
-		return java.util.Objects.hash(base, _data, pageSource);
+		return this.cp.getJavaSettings();
 	}
 
 	public boolean hasJavaSettings(PageContext pc) {
@@ -311,7 +300,7 @@ public ComponentImpl _duplicate(boolean deepCopy, boolean isTop) {
 		try {
 			// attributes
 			trg.pageSource = pageSource;
-			trg.cpRef = cpRef;
+			trg.cp = cp;
 			// trg._triggerDataMember=_triggerDataMember;
 			trg.useShadow = useShadow;
 			trg._static = _static;
@@ -485,7 +474,7 @@ public void init(PageContext pageContext, ComponentPageImpl componentPage, boole
 
 		if (base != null) {
 			this.dataMemberDefaultAccess = base.dataMemberDefaultAccess;
-			this._static = new StaticScope(base._static, this, cpRef, dataMemberDefaultAccess);
+			this._static = new StaticScope(base._static, this, new ComponentPageRef(componentPage), dataMemberDefaultAccess);
 			this.absFin = base.absFin;
 			_data = base._data;
 			_udfs = isRestEnabled ? new LinkedHashMap<Key, UDF>(base._udfs) : new HashMap<Key, UDF>(base._udfs);
@@ -496,7 +485,7 @@ public void init(PageContext pageContext, ComponentPageImpl componentPage, boole
 		}
 		else {
 			this.dataMemberDefaultAccess = pageContext.getConfig().getComponentDataMemberDefaultAccess();
-			this._static = new StaticScope(null, this, cpRef, dataMemberDefaultAccess);
+			this._static = new StaticScope(null, this, new ComponentPageRef(componentPage), dataMemberDefaultAccess);
 			// TODO get per CFC setting
 			// this._triggerDataMember=pageContext.getConfig().getTriggerComponentDataMember();
 			_udfs = isRestEnabled ? new LinkedHashMap<Key, UDF>() : new HashMap<Key, UDF>();
@@ -511,7 +500,7 @@ public void init(PageContext pageContext, ComponentPageImpl componentPage, boole
 
 		long indexBase = 0;
 		if (base != null) {
-			indexBase = base.cpRef.get(pageContext).getStaticStruct().index();
+			indexBase = base.cp.getStaticStruct().index();
 		}
 
 		// scope
@@ -759,8 +748,7 @@ else if (_namedArgs != null) {
 			return Reflector.componentToClass(pc, this).getClass();
 		}
 
-		// When calling via super, use public access for error message since super calls should access
-		// inherited methods
+		// When calling via super, use public access for error message since super calls should access inherited methods
 		int errorAccess = superAccess ? ACCESS_PUBLIC : access;
 		if (member == null) throw ComponentUtil.notFunction(this, KeyImpl.init(name), null, errorAccess);
 		throw ComponentUtil.notFunction(this, KeyImpl.init(name), member.getValue(), errorAccess);
@@ -990,21 +978,21 @@ private Collection.Key[] keysPreservingOrder(int access) {
 		if (_udfs.isEmpty() && _data.isEmpty()) {
 			return new Collection.Key[0];
 		}
-
+		
 		List<Key> orderedKeys = new ArrayList<Key>(_udfs.size() + _data.size());
-
-		for (Entry<Key, UDF> entry: _udfs.entrySet()) {
+		
+		for (Entry<Key, UDF> entry : _udfs.entrySet()) {
 			if (entry.getValue().getAccess() <= access) {
 				orderedKeys.add(entry.getKey());
 			}
 		}
-		for (Entry<Key, Member> entry: _data.entrySet()) {
+		for (Entry<Key, Member> entry : _data.entrySet()) {
 			Member member = entry.getValue();
 			if (member.getAccess() <= access && !(member instanceof UDF)) {
 				orderedKeys.add(entry.getKey());
 			}
 		}
-
+		
 		return orderedKeys.toArray(new Collection.Key[orderedKeys.size()]);
 	}
 
@@ -1194,7 +1182,8 @@ public DumpData toDumpData(PageContext pageContext, int maxlevel, DumpProperties
 					try {
 						return DumpUtil.toDumpData(_call(pageContext, KeyConstants.__toDumpData, udf, null, new Object[0]), pageContext, maxlevel, dp);
 					}
-					catch (PageException e) {}
+					catch (PageException e) {
+					}
 				}
 			}
 		}
@@ -1392,8 +1381,8 @@ public PageSource _getPageSource() {
 		return pageSource;
 	}
 
-	public ComponentPageImpl _getComponentPageImpl(PageContext pc) throws PageException {
-		return cpRef.get(pc);
+	public ComponentPageImpl _getComponentPageImpl() {
+		return cp;
 	}
 
 	public ImportDefintion[] _getImportDefintions() {
@@ -1728,7 +1717,7 @@ protected static Struct getMetaData(int access, PageContext pc, ComponentImpl co
 		if (!StringUtil.isEmpty(displayname)) sct.set(KeyConstants._displayname, displayname);
 
 		sct.set(KeyConstants._persistent, comp.properties.persistent);
-		// sct.set(KeyConstants._hashCode, comp.hashCode());
+		sct.set(KeyConstants._hashCode, comp.hashCode());
 		sct.set(KeyConstants._accessors, comp.properties.accessors);
 		sct.set(KeyConstants._synchronized, comp.properties._synchronized);
 		sct.set(KeyConstants._inline, comp.properties.inline);
@@ -1988,14 +1977,9 @@ private Object _set(PageContext pc, Collection.Key key, Object value, int access
 						"enable [trigger data member] in administrator to also invoke getters and setters");
 			if (existing != null) {
 				if (existing.getModifier() == Member.MODIFIER_FINAL) {
-					ComponentPageImpl tmp = cpRef.get(pc, null);
-					String componentName = tmp != null ? tmp.getComponentName() : "";
-
-					tmp = base.cpRef.get(pc, null);
-					String baseComponentName = tmp != null ? tmp.getComponentName() : "";
-
-					throw new ExpressionException("Attempt to modify a 'final' member [" + key + "] within the 'this' scope of the component [" + componentName
-							+ "]. This member is declared as 'final' in the base component [" + baseComponentName + "] or a component extended by it, and cannot be overridden.");
+					throw new ExpressionException("Attempt to modify a 'final' member [" + key + "] within the 'this' scope of the component [" + cp.getComponentName()
+							+ "]. This member is declared as 'final' in the base component [" + base.cp.getComponentName()
+							+ "] or a component extended by it, and cannot be overridden.");
 				}
 
 			}
@@ -2404,16 +2388,65 @@ public boolean isAccessors() {
 
 	@Override
 	public void setProperty(Property property) throws PageException {
-		top.properties.properties.put(StringUtil.toLowerCase(property.getName()), property);
-		// FUTURE getDefaultAsObject was added in Beta pahse of Lucee 7, so we keep the checkcast in place
-		if (((PropertyImpl) property).getDefaultAsObject() != null) scope.setEL(KeyImpl.init(property.getName()), ((PropertyImpl) property).getDefaultAsObject());
-		if (top.properties.persistent || top.properties.accessors) {
-			PropertyFactory.createPropertyUDFs(this, property);
+		// LDEV-3335: Handle property inheritance and overrides
+		PropertyImpl propImpl = (PropertyImpl) property;
+		PageSource propOwnerPS = propImpl.getOwnerPageSource();
+
+		// Check if this property is overriding an existing property (same name already registered)
+		String propNameLower = StringUtil.toLowerCase(propImpl.getName());
+		PropertyImpl existing = (PropertyImpl) top.properties.properties.get(propNameLower);
+		boolean isOverride = existing != null && propOwnerPS == null;
+
+		boolean isInherited = propOwnerPS != null && !propOwnerPS.equals(getPageSource());
+
+		if (isInherited && !isOverride) {
+			// Property is from a parent component - duplicate it to avoid sharing/mutation
+			propImpl = (PropertyImpl) propImpl.duplicate(false);
+		}
+		else if (propOwnerPS == null) {
+			// LDEV-3335: Property doesn't have owner set yet - set it to this component
+			// This happens for properties from __staticProperties that haven't been initialized
+			propImpl.setOwnerName(getAbsName(), getPageSource());
+		}
+
+		top.properties.properties.put(propNameLower, propImpl);
+		if (propImpl.getDefaultAsObject() != null) {
+			scope.setEL(propImpl.getNameAsKey(), propImpl.getDefaultAsObject());
+		}
+		// Create accessor UDFs if:
+		// 1. Component has accessors enabled, OR
+		// 2. Component is persistent, OR
+		// 3. Property is inherited and has accessors (need to create new UDFs with duplicated property)
+		// 4. Property is an override with accessors (child re-declaring parent property)
+		if (top.properties.persistent || top.properties.accessors || (isInherited && (propImpl.getGetter() || propImpl.getSetter()))
+				|| (isOverride && (propImpl.getGetter() || propImpl.getSetter()))) {
+			PropertyFactory.createPropertyUDFs(this, propImpl);
 		}
 	}
 
 	private void initProperties() throws PageException {
 		top.properties.properties = new LinkedHashMap<String, Property>();
+		// Call generated stub to initialize properties from static registry (zero overhead!)
+		if (top.cp != null) {
+			top.cp.initPropertiesStub(this);
+		}
+
+		// LDEV-3335: Add static flyweight accessor UDFs to _data and scope
+		Map<Key, UDF> staticAccessorUDFs = top.cp != null ? top.cp.getStaticAccessorUDFs() : null;
+		if (staticAccessorUDFs != null && !staticAccessorUDFs.isEmpty()) {
+			Iterator<Map.Entry<Key, UDF>> it = staticAccessorUDFs.entrySet().iterator();
+			while (it.hasNext()) {
+				Map.Entry<Key, UDF> entry = it.next();
+				Key key = entry.getKey();
+				UDF udf = entry.getValue();
+
+				// Only add if not manually overridden
+				if (!_data.containsKey(key)) {
+					_data.put(key, udf);
+					scope.put(key, udf);
+				}
+			}
+		}
 
 		// MappedSuperClass
 		if (isPersistent() && !isBasePeristent() && top.base != null && top.base.properties.properties != null && top.base.properties.meta != null) {
@@ -2424,8 +2457,11 @@ private void initProperties() throws PageException {
 				while (it.hasNext()) {
 					p = it.next().getValue();
 					if (p.isPeristent()) {
-
-						setProperty(p);
+						// LDEV-87: Don't override properties that child component has already declared
+						String propNameLower = StringUtil.toLowerCase(p.getName());
+						if (!top.properties.properties.containsKey(propNameLower)) {
+							setProperty(p);
+						}
 					}
 				}
 			}

core/src/main/java/lucee/runtime/ComponentPageImpl.java

@@ -26,6 +26,7 @@
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.Map.Entry;
 
 import jakarta.servlet.http.HttpServletRequest;
@@ -103,6 +104,11 @@ public abstract class ComponentPageImpl extends ComponentPage {
 
 	public static final lucee.runtime.type.Collection.Key REMOTE_PERSISTENT_ID = KeyConstants._Id16hohohh;
 
+	// Note: Static property registry is now generated per-class in bytecode, not in base class
+	// Each generated component class has its own __staticProperties field and __getStaticProperties()
+	// method
+	// See PageImpl.writeOutStatic() for bytecode generation
+
 	private long lastCheck = -1;
 
 	private StaticScope staticScope;
@@ -598,8 +604,7 @@ private void _callRest(PageContext pc, Component component, UDF udf, String path
 						pc.forceWrite(content);
 						hasContent = true;
 					}
-					catch (IOException e) {
-					}
+					catch (IOException e) {}
 				}
 			}
 
@@ -795,8 +800,7 @@ else if (args instanceof String) {
 							try {
 								args = new CFMLExpressionInterpreter().interpret(pc, str);
 							}
-							catch (PageException _pe) {
-							}
+							catch (PageException _pe) {}
 						}
 					}
 				}
@@ -1148,6 +1152,40 @@ public StaticStruct getStaticStruct() {
 		return new StaticStruct();
 	}
 
+	/**
+	 * Returns the static properties map for this component class. Components with properties will
+	 * override this method to return their static property registry. Default implementation returns
+	 * null for components without properties.
+	 *
+	 * @return Map of property names to PropertyImpl instances, or null if no properties
+	 */
+	public Map<String, lucee.runtime.component.PropertyImpl> getStaticProperties() {
+		return null;
+	}
+
+	/**
+	 * LDEV-3335: Returns the static flyweight accessor UDF map for this component class. Components
+	 * with accessors will override this to return their static UDF registry. Default implementation
+	 * returns null for components without accessor UDFs.
+	 *
+	 * @return Map of accessor names to UDF instances, or null if no accessor UDFs
+	 */
+	public Map<Key, UDF> getStaticAccessorUDFs() {
+		return null;
+	}
+
+	/**
+	 * Initializes component properties from the static property registry. Components with properties
+	 * will override this method to provide optimized property initialization. Default implementation
+	 * does nothing (no-op for components without properties).
+	 *
+	 * @param impl The ComponentImpl instance to initialize properties for
+	 * @throws PageException if property initialization fails
+	 */
+	public void initPropertiesStub(ComponentImpl impl) throws PageException {
+		// No-op for components without properties
+	}
+
 	public abstract void initComponent(PageContext pc, ComponentImpl c, boolean executeDefaultConstructor) throws PageException;
 
 	public void ckecked() {