Author: alexsmirnov Date: 2008-06-05 17:50:19 -0400 (Thu, 05 Jun 2008) New Revision: 8923 Modified: branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/application/AjaxStateManager.java branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/event/InitPhaseListener.java Log: http://jira.jboss.com/jira/browse/RF-3306 fixed http://jira.jboss.com/jira/browse/RF-3542 fixed Modified: branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/application/AjaxStateManager.java =================================================================== --- branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/application/AjaxStateManager.java 2008-06-05 21:00:25 UTC (rev 8922) +++ branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/application/AjaxStateManager.java 2008-06-05 21:50:19 UTC (rev 8923) @@ -47,7 +47,7 @@ import org.ajax4jsf.context.AjaxContext; import org.ajax4jsf.event.AjaxPhaseListener; -import org.apache.commons.collections.map.LRUMap; +import org.ajax4jsf.util.LRUMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -279,18 +279,20 @@ _log .debug("No saved view state found for a Id " + id - + ". Restore last saved state"); + ); } - restoredState = (Object[]) logicalStates - .get(logicalStates.lastKey()); + // http://jira.jboss.com/jira/browse/RF-3542 +// restoredState = (Object[]) logicalStates +// .get(logicalStates.lastKey()); } } else { if (_log.isDebugEnabled()) { _log - .debug("No version Id for a saved view state in request. Restore last saved state"); + .debug("No version Id for a saved view state in request."); } - restoredState = (Object[]) logicalStates - .get(logicalStates.lastKey()); + // http://jira.jboss.com/jira/browse/RF-3542 +// restoredState = (Object[]) logicalStates +// .get(logicalStates.lastKey()); } } else if (_log.isDebugEnabled()) { _log Modified: branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/event/InitPhaseListener.java =================================================================== --- branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/event/InitPhaseListener.java 2008-06-05 21:00:25 UTC (rev 8922) +++ branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/event/InitPhaseListener.java 2008-06-05 21:50:19 UTC (rev 8923) @@ -79,13 +79,14 @@ } FacesContext facesContext = event.getFacesContext(); Application application = facesContext.getApplication(); - StateManager stateManager = application.getStateManager(); - if(! (stateManager instanceof AjaxStateManager)){ - if(log.isDebugEnabled()){ - log.debug("Set AjaxStateManager on top of chain"); - } - application.setStateManager(new AjaxStateManager(stateManager)); - } + // http://jira.jboss.com/jira/browse/RF-3306 +// StateManager stateManager = application.getStateManager(); +// if(! (stateManager instanceof AjaxStateManager)){ +// if(log.isDebugEnabled()){ +// log.debug("Set AjaxStateManager on top of chain"); +// } +// application.setStateManager(new AjaxStateManager(stateManager)); +// } ViewHandler viewHandler = application.getViewHandler(); if (!(viewHandler instanceof AjaxViewHandler)) { if(log.isDebugEnabled()){