Author: chris.laprun(a)jboss.com Date: 2010-02-10 05:23:39 -0500 (Wed, 10 Feb 2010) New Revision: 1609 Modified: components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/RedirectOnNoConsumerNavigationHandler.java Log: - Really fix the issue with persistent selected consumer id when switching back to consumers tab. Modified: components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/RedirectOnNoConsumerNavigationHandler.java =================================================================== --- components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/RedirectOnNoConsumerNavigationHandler.java 2010-02-10 09:06:38 UTC (rev 1608) +++ components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/RedirectOnNoConsumerNavigationHandler.java 2010-02-10 10:23:39 UTC (rev 1609) @@ -36,6 +36,9 @@ private static final String CONFIGURE_CONSUMER = "configureConsumer"; private static final String CONSUMERS = "consumers"; + /** must match ConsumerManagerBean in faces-config.xml */ + private static final String CONSUMERS_MGR = "consumersMgr"; + public RedirectOnNoConsumerNavigationHandler(NavigationHandler base) { this.base = base; @@ -63,8 +66,9 @@ } else if (CONSUMERS.equals(outcome)) { - // remove any remaining consumer id from session as we only want to list them - JSFBeanContext.getSessionMap(facesContext).remove(ConsumerManagerBean.SESSION_CONSUMER_ID); + // ensure that state is properly reset by calling ConsumerManagerBean.listConsumers() + ConsumerManagerBean consumersMgr = (ConsumerManagerBean)JSFBeanContext.getSessionMap(facesContext).get(CONSUMERS_MGR); + outcome = consumersMgr.listConsumers(); } base.handleNavigation(facesContext, fromAction, outcome);