Author: chris.laprun(a)jboss.com Date: 2007-06-20 19:44:35 -0400 (Wed, 20 Jun 2007) New Revision: 7496 Modified: tags/JBoss_Portal_2_6_0_CR3/wsrp/src/main/org/jboss/portal/wsrp/consumer/ConsumerRegistryService.java Log: - JBPORTAL-1492: Check that the consumer is registered before trying to deregister. Modified: tags/JBoss_Portal_2_6_0_CR3/wsrp/src/main/org/jboss/portal/wsrp/consumer/ConsumerRegistryService.java =================================================================== --- tags/JBoss_Portal_2_6_0_CR3/wsrp/src/main/org/jboss/portal/wsrp/consumer/ConsumerRegistryService.java 2007-06-20 23:40:58 UTC (rev 7495) +++ tags/JBoss_Portal_2_6_0_CR3/wsrp/src/main/org/jboss/portal/wsrp/consumer/ConsumerRegistryService.java 2007-06-20 23:44:35 UTC (rev 7496) @@ -120,7 +120,13 @@ { log.debug("releaseSessions failed when attempting to destroy " + CONSUMER_WITH_ID + id + "'"); } - registerOrDeregisterConsumerWith(id, false); + + // if the consumer is registered, deregister it + if (info.isRegistered()) + { + registerOrDeregisterConsumerWith(id, false); + } + deactivateConsumerWith(id); consumers.remove(id);