Author: chris.laprun(a)jboss.com Date: 2009-12-20 20:26:23 -0500 (Sun, 20 Dec 2009) New Revision: 1081 Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/registry/AbstractConsumerRegistry.java components/wsrp/trunk/producer/src/main/java/org/gatein/registration/impl/RegistrationManagerImpl.java Log: - Do not try to activate consumers on reload. Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/registry/AbstractConsumerRegistry.java =================================================================== --- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/registry/AbstractConsumerRegistry.java 2009-12-21 00:37:32 UTC (rev 1080) +++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/registry/AbstractConsumerRegistry.java 2009-12-21 01:26:23 UTC (rev 1081) @@ -265,21 +265,6 @@ producerInfo.setRegistry(this); createConsumerFrom(producerInfo); - - try - { - // if the producer is marked as active, activate it fo' real! :) - if (producerInfo.isActive()) - { - activateConsumerWith(producerInfo.getId()); - } - } - catch (Exception e) - { - producerInfo.setActive(false); - updateProducerInfo(producerInfo); - } - } } Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/registration/impl/RegistrationManagerImpl.java =================================================================== --- components/wsrp/trunk/producer/src/main/java/org/gatein/registration/impl/RegistrationManagerImpl.java 2009-12-21 00:37:32 UTC (rev 1080) +++ components/wsrp/trunk/producer/src/main/java/org/gatein/registration/impl/RegistrationManagerImpl.java 2009-12-21 01:26:23 UTC (rev 1081) @@ -42,7 +42,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; -import java.util.Iterator; import java.util.Map; /** @@ -187,9 +186,10 @@ } // cascade delete the registrations - for (Iterator i = new ArrayList(consumer.getRegistrations()).iterator(); i.hasNext();) + ArrayList<Registration> registrations = new ArrayList<Registration>(consumer.getRegistrations()); + for (Registration reg : registrations) { - removeRegistration((Registration)i.next()); + removeRegistration(reg); } // let the registry do the actual deletion