Fix #5522: Revert "Improve timing of firing PreRemoveFromViewEvent wrt

children #5445" This reverts commit 6fb231a.
eclipse-ee4j · Oct 29, 2024 · 277c14d · 277c14d
1 parent 76f1b4e
commit 277c14d
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/impl/src/main/java/jakarta/faces/component/UIComponentBase.java b/impl/src/main/java/jakarta/faces/component/UIComponentBase.java
@@ -1831,8 +1831,9 @@ private static void publishAfterViewEvents(FacesContext context, Application app
 
     private static void disconnectFromView(FacesContext context, Application application, UIComponent component) {
 
+        application.publishEvent(context, PreRemoveFromViewEvent.class, component);
         component.setInView(false);
-
+        component.compositeParent = null;
         if (component.getChildCount() > 0) {
             List<UIComponent> children = component.getChildren();
             for (UIComponent c : children) {
@@ -1846,8 +1847,6 @@ private static void disconnectFromView(FacesContext context, Application applica
             }
         }
 
-        application.publishEvent(context, PreRemoveFromViewEvent.class, component);
-        component.compositeParent = null;
     }
 
     // --------------------------------------------------------- Private Classes