[jboss-cvs] JBossAS SVN: r86995 - trunk/profileservice/src/main/org/jboss/profileservice/management/templates.

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

Author: emuckenhuber
Date: 2009-04-08 16:55:59 -0400 (Wed, 08 Apr 2009)
New Revision: 86995

Modified:
   trunk/profileservice/src/main/org/jboss/profileservice/management/templates/JmsDestinationTemplate.java
Log:
[JBAS-6755]

Modified: trunk/profileservice/src/main/org/jboss/profileservice/management/templates/JmsDestinationTemplate.java
===================================================================
--- trunk/profileservice/src/main/org/jboss/profileservice/management/templates/JmsDestinationTemplate.java	2009-04-08 20:42:32 UTC (rev 86994)
+++ trunk/profileservice/src/main/org/jboss/profileservice/management/templates/JmsDestinationTemplate.java	2009-04-08 20:55:59 UTC (rev 86995)
@@ -27,7 +27,6 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.management.ObjectName;
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBElement;
 import javax.xml.bind.Marshaller;
@@ -178,11 +177,13 @@
       Map<String, ManagedProperty> properties = info.getProperties();
       for(ManagedProperty p : properties.values())
       {
-         if(p.hasViewUse(ViewUse.CONFIGURATION) == false)
+         boolean skip = p.getValue() == null
+            || p.hasViewUse(ViewUse.CONFIGURATION) == false
+            || p.isReadOnly()
+            || p.isRemoved();
+          
+         if(skip)
             continue;
-            
-        if(p.isReadOnly())
-           continue;
          
          MetaValue v = p.getValue();
          if(v == null)
@@ -197,7 +198,6 @@
             name = Character.toUpperCase(c) + name.substring(1);
          
          JmsAttribute attribute = null;
-         
          if(v.getMetaType().isSimple())
          {
             attribute = new JmsAttributeMetaData(name, "" + ((SimpleValue)v).getValue());
@@ -206,13 +206,13 @@
          {
             if(name.equals("DLQ"))
             {
-               ObjectName n = (ObjectName) mvf.unwrap(v);
-               attribute = new JmsAttributeMetaData("DLQ", n.getCanonicalName());
+               String n = (String) mvf.unwrap(v);
+               attribute = new JmsAttributeMetaData("DLQ", n);
             }
             else if(name.equals("ExpiryQueue"))
             {
-               ObjectName n = (ObjectName) mvf.unwrap(v);
-               attribute = new JmsAttributeMetaData("ExpiryQueue", n.getCanonicalName());
+               String n = (String) mvf.unwrap(v);
+               attribute = new JmsAttributeMetaData("ExpiryQueue", n);
             }
             else if(name.equals("SecurityConfig"))
             {
@@ -228,10 +228,10 @@
       List<JmsDependencyMetaData> depends = new ArrayList<JmsDependencyMetaData>();
       destination.depends = depends;
       // Set server peer
-      ObjectName serverPeer = (ObjectName) getProperty(info, "serverPeer");
+      String serverPeer = (String) getProperty(info, "serverPeer");
       if(serverPeer != null)
       {
-         depends.add(new JmsDependencyMetaData("ServerPeer", serverPeer.getCanonicalName()));
+         depends.add(new JmsDependencyMetaData("ServerPeer", serverPeer));
       }
       else
       {
@@ -281,9 +281,7 @@
       Map<String, ManagedProperty> propsInfo = info.getProperties();
       ManagedProperty prop = propsInfo.get(propName);
       if(prop == null)
-      {
-         throw new IllegalStateException("Property " + propName + " not found.");
-      }
+         return null;
       Object value = prop.getValue();
       if(value instanceof MetaValue)
       {