Author: chris.laprun(a)jboss.com Date: 2011-05-18 10:11:10 -0400 (Wed, 18 May 2011) New Revision: 6486 Modified: components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/registration/JCRRegistrationPersistenceManager.java Log: - GTNWSRP-229: just call super if there's no ConsumerGroup with the specified name to avoid NPE. Modified: components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/registration/JCRRegistrationPersistenceManager.java =================================================================== --- components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/registration/JCRRegistrationPersistenceManager.java 2011-05-18 14:07:48 UTC (rev 6485) +++ components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/registration/JCRRegistrationPersistenceManager.java 2011-05-18 14:11:10 UTC (rev 6486) @@ -214,7 +214,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) {