LDEV-6172 fix physicalFirst override in MappingImpl lazy init

Author: zspitzer

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

@@ -183,7 +183,7 @@ private void initPhysical() {
 				if (physical == null && strPhysical != null) {
 					ServletContext cs = (config instanceof ConfigWeb) ? ((ConfigWeb) config).getServletContext() : null;
 					physical = ConfigWebUtil.getResource(cs, strPhysical, config.getConfigDir(), FileUtil.TYPE_DIR, config, checkPhysicalFromWebroot, false);
-					if (archive == null) this.physicalFirst = true;
+					if (strArchive == null) this.physicalFirst = true;
 					else if (physical == null) this.physicalFirst = false;
 				}
 			}
@@ -210,8 +210,8 @@ private void initArchive() {
 						tmp = null;
 					}
 
-					if (tmp == null) this.physicalFirst = true;
-					else if (physical == null) this.physicalFirst = false;
+					if (tmp == null && strPhysical != null) this.physicalFirst = true;
+					else if (strPhysical == null) this.physicalFirst = false;
 					archive = tmp;
 				}
 			}

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.6.5-SNAPSHOT"/>
+  <property name="version" value="6.2.6.6-SNAPSHOT"/>
 
   <taskdef uri="antlib:org.apache.maven.resolver.ant" resource="org/apache/maven/resolver/ant/antlib.xml">
     <classpath>

loader/pom.xml

@@ -3,7 +3,7 @@
 
   <groupId>org.lucee</groupId>
   <artifactId>lucee</artifactId>
-  <version>6.2.6.5-SNAPSHOT</version>
+  <version>6.2.6.6-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Lucee Loader Build</name>

test/general/Archives.cfc

@@ -23,6 +23,7 @@ component extends="org.lucee.cfml.test.LuceeTestCase" labels="archive,mapping" {
 		_buildHybridPhysicalFirst();
 		_buildMissingPhysical();
 		_buildMissingArchive();
+		_buildCorruptArchive();
 	}
 
 	function afterAll() {
@@ -73,8 +74,7 @@ component extends="org.lucee.cfml.test.LuceeTestCase" labels="archive,mapping" {
 
 		describe( "Hybrid physical + archive with primary=archive", function() {
 
-			it( title="should prefer archive over physical when primary is archive", skip=true, body=function() {
-				// LDEV-6172: initPhysical() overrides physicalFirst before archive init
+			it( title="should prefer archive over physical when primary is archive", body=function() {
 				var result = _internalRequest(
 					template: "#_uri()#/hybrid/index.cfm",
 					urls: { scene: "archive" }
@@ -130,6 +130,17 @@ component extends="org.lucee.cfml.test.LuceeTestCase" labels="archive,mapping" {
 
 		});
 
+		describe( "Graceful fallback when archive is corrupt", function() {
+
+			it( "should fall back to physical when archive is not a valid LAR", function() {
+				var result = _internalRequest(
+					template: "#_uri()#/corruptArchive/index.cfm"
+				);
+				expect( result.fileContent.trim() ).toBe( "from-physical" );
+			});
+
+		});
+
 	}
 
 	// ---- archive builders ----
@@ -244,6 +255,17 @@ component extends="org.lucee.cfml.test.LuceeTestCase" labels="archive,mapping" {
 		// intentionally do NOT create physDir
 	}
 
+	private function _buildCorruptArchive() {
+		var corruptLar = variables.testDir & "corrupt.lar";
+		var physDir = variables.testDir & "corruptArchive-physical/";
+
+		// write garbage bytes — not a valid JAR/ZIP
+		fileWrite( corruptLar, repeatString( "NOT A VALID LAR FILE", 100 ) );
+
+		directoryCreate( physDir, true, true );
+		fileWrite( physDir & "hello.cfm", "<cfset writeOutput( 'from-physical' )>" );
+	}
+
 	private function _buildMissingArchive() {
 		// archive path points to a non-existent .lar, physical is valid
 		var physDir = variables.testDir & "missingArchive-physical/";

test/general/archives/corruptArchive/Application.cfc

@@ -0,0 +1,11 @@
+component {
+
+	variables.testDir = getTempDirectory() & "archivesTest/";
+
+	this.mappings[ "/corruptArchiveLib" ] = {
+		physical: variables.testDir & "corruptArchive-physical/",
+		archive: variables.testDir & "corrupt.lar",
+		primary: "archive"
+	};
+
+}

test/general/archives/corruptArchive/index.cfm

@@ -0,0 +1 @@
+<cfinclude template="/corruptArchiveLib/hello.cfm">