You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2026/03/24 14:47:14 UTC

(tomcat) branch 11.0.x updated: Improve exception for inconsistent mapping data

This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/11.0.x by this push:
     new 374a335c1c Improve exception for inconsistent mapping data
374a335c1c is described below

commit 374a335c1c59f755129eb5cc4e705751e2f4345c
Author: remm <re...@apache.org>
AuthorDate: Tue Mar 24 15:46:39 2026 +0100

    Improve exception for inconsistent mapping data
---
 java/org/apache/catalina/mapper/LocalStrings.properties | 1 +
 java/org/apache/catalina/mapper/Mapper.java             | 2 +-
 java/org/apache/catalina/mapper/MappingData.java        | 6 ++++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/mapper/LocalStrings.properties b/java/org/apache/catalina/mapper/LocalStrings.properties
index 5dcf15be74..9f2c852ca0 100644
--- a/java/org/apache/catalina/mapper/LocalStrings.properties
+++ b/java/org/apache/catalina/mapper/LocalStrings.properties
@@ -22,6 +22,7 @@ mapper.addHost.sameHost=Duplicate registration of the same host [{0}]. Ignored.
 mapper.addHost.success=Registered host [{0}]
 mapper.addHostAlias.sameHost=Duplicate registration of alias [{0}] for the same host [{1}]. Ignored.
 mapper.addHostAlias.success=Registered alias [{0}] for host [{1}]
+mapper.alreadyDone=Mapping was already done on this request on [{0}]
 mapper.duplicateHost=Duplicate Host [{0}]. The name is already used by Host [{1}]. This Host will be ignored.
 mapper.duplicateHostAlias=Duplicate host Alias [{0}] in Host [{1}]. The name is already used by Host [{2}]. This Alias will be ignored.
 mapper.findContext.noContext=No context found [{0}]
diff --git a/java/org/apache/catalina/mapper/Mapper.java b/java/org/apache/catalina/mapper/Mapper.java
index 37719cb10f..487283c920 100644
--- a/java/org/apache/catalina/mapper/Mapper.java
+++ b/java/org/apache/catalina/mapper/Mapper.java
@@ -710,7 +710,7 @@ public final class Mapper {
             // skipped all mapping work in this case. That behaviour has a risk
             // of returning an inconsistent result.
             // I do not see a valid use case for it.
-            throw new AssertionError();
+            throw new IllegalStateException(sm.getString("mapper.alreadyDone", mappingData));
         }
 
         // Virtual host mapping
diff --git a/java/org/apache/catalina/mapper/MappingData.java b/java/org/apache/catalina/mapper/MappingData.java
index ca6a47b91d..b2db453081 100644
--- a/java/org/apache/catalina/mapper/MappingData.java
+++ b/java/org/apache/catalina/mapper/MappingData.java
@@ -57,4 +57,10 @@ public class MappingData {
         redirectPath.recycle();
         matchType = null;
     }
+
+    @Override
+    public final String toString() {
+        return "MappingData[" + host + ":" + context + ":" + wrapper + "]";
+    }
+
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org