Implement correct fix for #5059 as per #5625

Author: BalusC

impl/src/main/java/com/sun/faces/facelets/impl/DefaultFacelet.java

@@ -27,26 +27,26 @@
 import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import com.sun.faces.facelets.tag.faces.ComponentSupport;
-import com.sun.faces.util.FacesLogger;
-import com.sun.faces.util.Util;
-
 import jakarta.el.ELException;
 import jakarta.el.ExpressionFactory;
 import jakarta.faces.FacesException;
 import jakarta.faces.application.ProjectStage;
 import jakarta.faces.component.Doctype;
+import jakarta.faces.component.TransientStateHelper;
 import jakarta.faces.component.UIComponent;
 import jakarta.faces.context.FacesContext;
 import jakarta.faces.view.facelets.Facelet;
 import jakarta.faces.view.facelets.FaceletContext;
 import jakarta.faces.view.facelets.FaceletException;
 import jakarta.faces.view.facelets.FaceletHandler;
 
+import com.sun.faces.facelets.tag.faces.ComponentSupport;
+import com.sun.faces.util.FacesLogger;
+import com.sun.faces.util.Util;
+
 /**
  * Default Facelet implementation.
  *
@@ -150,7 +150,7 @@ private void refresh(UIComponent c) {
                 while (--sz >= 0) {
                     UIComponent cc = (UIComponent) cl.get(sz);
                     if (!cc.isTransient()) {
-                        token = (ApplyToken) cc.getAttributes().get(APPLIED_KEY);
+                        token = (ApplyToken) cc.getTransientStateHelper().getTransient(APPLIED_KEY);
                         if (token != null && token.time < createTime && token.alias.equals(alias)) {
                             if (log.isLoggable(Level.INFO)) {
                                 DateFormat df = SimpleDateFormat.getTimeInstance();
@@ -171,7 +171,7 @@ private void refresh(UIComponent c) {
                 for (Iterator itr = col.iterator(); itr.hasNext();) {
                     fc = (UIComponent) itr.next();
                     if (!fc.isTransient()) {
-                        token = (ApplyToken) fc.getAttributes().get(APPLIED_KEY);
+                        token = (ApplyToken) fc.getTransientStateHelper().getTransient(APPLIED_KEY);
                         if (token != null && token.time < createTime && token.alias.equals(alias)) {
                             if (log.isLoggable(Level.INFO)) {
                                 DateFormat df = SimpleDateFormat.getTimeInstance();
@@ -193,9 +193,9 @@ private void markApplied(UIComponent parent) {
             while (itr.hasNext()) {
                 UIComponent c = (UIComponent) itr.next();
                 if (!c.isTransient()) {
-                    Map<String, Object> attr = c.getAttributes();
-                    if (!attr.containsKey(APPLIED_KEY)) {
-                        attr.put(APPLIED_KEY, token);
+                    TransientStateHelper state = c.getTransientStateHelper();
+                    if (state.getTransient(APPLIED_KEY) == null) {
+                        state.putTransient(APPLIED_KEY, token);
                     }
                 }
             }