[jboss-cvs] JBossAS SVN: r87100 - in trunk: testsuite/src/main/org/jboss/test/profileservice/override/test and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: emuckenhuber
Date: 2009-04-09 16:49:08 -0400 (Thu, 09 Apr 2009)
New Revision: 87100

Modified:
   trunk/messaging/src/main/org/jboss/jms/server/destination/SecurityConfigMapper.java
   trunk/testsuite/src/main/org/jboss/test/profileservice/override/test/JmsDestinationOverrideTestCase.java
Log:
JBAS-6716

Modified: trunk/messaging/src/main/org/jboss/jms/server/destination/SecurityConfigMapper.java
===================================================================
--- trunk/messaging/src/main/org/jboss/jms/server/destination/SecurityConfigMapper.java	2009-04-09 20:30:39 UTC (rev 87099)
+++ trunk/messaging/src/main/org/jboss/jms/server/destination/SecurityConfigMapper.java	2009-04-09 20:49:08 UTC (rev 87100)
@@ -132,6 +132,10 @@
          {
             // Role
             CompositeValue row = (CompositeValue) value.get(name);
+            // FIXME the MapMetaType might not be up 2 date
+            if(row == null)
+               continue;
+            
             Element role = d.createElement("role");
             role.setAttribute("name", name);
             

Modified: trunk/testsuite/src/main/org/jboss/test/profileservice/override/test/JmsDestinationOverrideTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/profileservice/override/test/JmsDestinationOverrideTestCase.java	2009-04-09 20:30:39 UTC (rev 87099)
+++ trunk/testsuite/src/main/org/jboss/test/profileservice/override/test/JmsDestinationOverrideTestCase.java	2009-04-09 20:49:08 UTC (rev 87100)
@@ -143,8 +143,15 @@
       
       mgtView = getManagementView();
       queue = mgtView.getComponent("testQueueTemplate", type);
-      MetaValue securityConfig = queue.getProperty("securityConfig").getValue();
+      MapCompositeValueSupport securityConfig = (MapCompositeValueSupport) queue.getProperty("securityConfig").getValue();
       assertEquals(map, securityConfig);
+      
+      securityConfig.remove("publisher");
+      
+      mgtView.updateComponent(queue);
+      securityConfig = (MapCompositeValueSupport) queue.getProperty("securityConfig").getValue();
+      assertNotNull(securityConfig);
+      assertNull(securityConfig.get("publisher"));
    }