Author: chris.laprun(a)jboss.com Date: 2007-06-14 17:09:08 -0400 (Thu, 14 Jun 2007) New Revision: 7422 Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java Log: - Made activate call refresh to make sure that the consumer information is valid. Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java =================================================================== --- trunk/wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java 2007-06-14 21:02:41 UTC (rev 7421) +++ trunk/wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java 2007-06-14 21:09:08 UTC (rev 7422) @@ -87,7 +87,19 @@ { if (activate) { - registry.activateConsumerWith(selectedId); + WSRPConsumer consumer = getSelectedConsumer(); + if (consumer.isRefreshNeeded()) + { + RefreshResult result = internalRefresh(consumer); + if (result != null && !result.hasIssues()) + { + registry.activateConsumerWith(selectedId); + } + } + else + { + registry.activateConsumerWith(selectedId); + } } else { @@ -197,22 +209,7 @@ { if (refreshConsumerId() != null) { - try - { - RefreshResult result = getSelectedConsumer().refresh(true); - if (result.hasIssues()) - { - createErrorMessage(result.getStatus()); - } - else - { - createInfoMessage(null, result.getStatus()); - } - } - catch (PortletInvokerException e) - { - createErrorMessageFrom(e); - } + internalRefresh(getSelectedConsumer()); return configureConsumer(); } @@ -223,6 +220,28 @@ } } + private RefreshResult internalRefresh(WSRPConsumer consumer) + { + try + { + RefreshResult result = consumer.refresh(true); + if (result.hasIssues()) + { + createErrorMessage(result.getStatus()); + } + else + { + createInfoMessage(null, result.getStatus()); + } + return result; + } + catch (PortletInvokerException e) + { + createErrorMessageFrom(e); + return null; + } + } + public String listConsumers() { setConsumerIdInSession(true);