[portal-commits] JBoss Portal SVN: r5795 - in trunk/wsrp/src/main/org/jboss/portal: test/wsrp/registration wsrp/producer/registration/impl

[portal-commits at lists.jboss.org]

Author: chris.laprun at jboss.com
Date: 2006-12-11 11:31:23 -0500 (Mon, 11 Dec 2006)
New Revision: 5795

Modified:
   trunk/wsrp/src/main/org/jboss/portal/test/wsrp/registration/RegistrationManagerTestCase.java
   trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/registration/impl/RegistrationManagerImpl.java
Log:
- Fixed a bug in createConsumer where incorrect name was passed for the Consumer (thanks Julien)
- Modified test so that group name doesn't shadow consumer name (which hid the bug).

Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/registration/RegistrationManagerTestCase.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/registration/RegistrationManagerTestCase.java	2006-12-11 16:22:08 UTC (rev 5794)
+++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/registration/RegistrationManagerTestCase.java	2006-12-11 16:31:23 UTC (rev 5795)
@@ -147,7 +147,7 @@
       {
          public String getGroupNameFor(String consumerName)
          {
-            return consumerName;
+            return "group_" + consumerName;
          }
       };
       manager.setPolicy(policy);
@@ -157,7 +157,7 @@
       Consumer consumer = manager.createConsumer(name);
       assertNotNull(consumer);
 
-      ConsumerGroup group = manager.getConsumerGroup(name);
+      ConsumerGroup group = manager.getConsumerGroup("group_" + name);
       assertNotNull(group);
       assertEquals(group, consumer.getGroup());
       assertTrue(group.getConsumers().contains(consumer));

Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/registration/impl/RegistrationManagerImpl.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/registration/impl/RegistrationManagerImpl.java	2006-12-11 16:22:08 UTC (rev 5794)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/registration/impl/RegistrationManagerImpl.java	2006-12-11 16:31:23 UTC (rev 5795)
@@ -132,10 +132,10 @@
 
       // deal with group if needed
       // let the policy decide if there should be a group associated with the Consumer and if yes, with which id
-      String groupName = policy.getGroupNameFor(consumer.getName());
+      String groupName = policy.getGroupNameFor(name);
       if (groupName != null)
       {
-         addConsumerToGroupNamed(groupName, groupName, true, false);
+         addConsumerToGroupNamed(name, groupName, true, false);
       }
 
       return consumer;