Author: chris.laprun(a)jboss.com Date: 2011-05-18 10:07:48 -0400 (Wed, 18 May 2011) New Revision: 6485 Modified: epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/JCRRegistrationPersistenceManager.java Log: - JBEPP-954: just call super, if there is no ConsumerGroup with the specified name in internalRemoveConsumerGroup. Modified: epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/JCRRegistrationPersistenceManager.java =================================================================== --- epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/JCRRegistrationPersistenceManager.java 2011-05-18 14:00:31 UTC (rev 6484) +++ epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/JCRRegistrationPersistenceManager.java 2011-05-18 14:07:48 UTC (rev 6485) @@ -213,7 +213,14 @@ try { ConsumerGroup group = getConsumerGroup(name); - remove(group.getPersistentKey(), ConsumerGroupMapping.class); + if (group == null) + { + return super.internalRemoveConsumerGroup(name); + } + else + { + remove(group.getPersistentKey(), ConsumerGroupMapping.class); + } } catch (RegistrationException e) {