From 3ab12757812b277c1c794877d93d80147d450511 Mon Sep 17 00:00:00 2001
From: Ken Finnigan <ken@kenfinnigan.me>
Date: Fri, 7 Jun 2013 14:58:07 -0400
Subject: [PATCH] PBR-468 Remove fixes when StateContext AddRemoveListener is
 no longer retained on UIViewRoot

---
 .../controller/Jsf20ControllerImpl.java       | 25 -------------------
 1 file changed, 25 deletions(-)

diff --git a/core/portletbridge-impl/src/main/java/org/jboss/portletbridge/bridge/controller/Jsf20ControllerImpl.java b/core/portletbridge-impl/src/main/java/org/jboss/portletbridge/bridge/controller/Jsf20ControllerImpl.java
index 9524d8f..d6d2564 100644
--- a/core/portletbridge-impl/src/main/java/org/jboss/portletbridge/bridge/controller/Jsf20ControllerImpl.java
+++ b/core/portletbridge-impl/src/main/java/org/jboss/portletbridge/bridge/controller/Jsf20ControllerImpl.java
@@ -454,31 +454,6 @@ protected void encodeMarkupResponse(BridgeContext bridgeContext, FacesContext fa
             }
         }
 
-        // ***** TO BE REMOVED AS PART OF PBR-468 WHEN JSF IMPL FIX AVAILABLE *******
-        // START
-        // Remove StateContext from FacesContext to prevent issues with Dynamic Actions being retained between Renders
-        facesContext.getAttributes().remove(StateContext.class.getName() + "_KEY");
-
-        // Unregister PostAddToViewEvent listener if it's StateContext.AddRemoveListener
-        List<SystemEventListener> postAddListeners = facesContext.getViewRoot().getViewListenersForEventClass(PostAddToViewEvent.class);
-        if (null != postAddListeners && !postAddListeners.isEmpty()) {
-            for (SystemEventListener listener : postAddListeners) {
-                if (listener instanceof AddRemoveListener) {
-                    facesContext.getViewRoot().unsubscribeFromViewEvent(PostAddToViewEvent.class, listener);
-                }
-            }
-        }
-        // Unregister PreRemoveFromViewEvent listener if it's StateContext.AddRemoveListener
-        List<SystemEventListener> preRemoveListeners = facesContext.getViewRoot().getViewListenersForEventClass(PreRemoveFromViewEvent.class);
-        if (null != preRemoveListeners && !preRemoveListeners.isEmpty()) {
-            for (SystemEventListener listener : preRemoveListeners) {
-                if (listener instanceof AddRemoveListener) {
-                    facesContext.getViewRoot().unsubscribeFromViewEvent(PreRemoveFromViewEvent.class, listener);
-                }
-            }
-        }
-        // END
-
         saveFacesView(scope, facesContext);
 
         if (Bridge.PortletPhase.RESOURCE_PHASE == bridgeContext.getPortletRequestPhase()) {