Merge pull request #5109 from eclipse-ee4j/mojarra_issue_4281

Fix #4281: corrupted component tree when using namespaced HTML elements
eclipse-ee4j · Jun 2, 2022 · 1e187e8 · 1e187e8
2 parents 9888599 + 12bd2e2
commit 1e187e8
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/impl/src/main/java/com/sun/faces/facelets/compiler/CompilationManager.java b/impl/src/main/java/com/sun/faces/facelets/compiler/CompilationManager.java
@@ -294,11 +294,14 @@ public void popTag() {
                 this.finishUnit();
             } else {
                 t.endTag();
+                if (t.isClosed()) {
+                    this.finishUnit();
+                }
                 return;
             }
+            unit = this.currentUnit();
         }
 
-        unit = this.currentUnit();
         if (unit instanceof TagUnit) {
             TagUnit t = (TagUnit) unit;
             if (t instanceof TrimmedTagUnit) {