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

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

Author: emuckenhuber
Date: 2010-04-27 07:51:50 -0400 (Tue, 27 Apr 2010)
New Revision: 104263

Modified:
   trunk/profileservice/src/main/java/org/jboss/profileservice/management/ManagementViewImpl.java
Log:
process ManagedComponents before runtime ManagedObjects.

Modified: trunk/profileservice/src/main/java/org/jboss/profileservice/management/ManagementViewImpl.java
===================================================================
--- trunk/profileservice/src/main/java/org/jboss/profileservice/management/ManagementViewImpl.java	2010-04-27 10:15:47 UTC (rev 104262)
+++ trunk/profileservice/src/main/java/org/jboss/profileservice/management/ManagementViewImpl.java	2010-04-27 11:51:50 UTC (rev 104263)
@@ -675,12 +675,35 @@
 
       // See if this is a runtime ManagedObject
       Map<String, Annotation> moAnns = mo.getAnnotations();
+      
+      // Create ManagedComponents for ManagedObjects annotated with ManagementComponent
+      ManagementComponent mc = (ManagementComponent) moAnns.get(ManagementComponent.class.getName());
+      if (mc != null && md.getComponent(mo.getName()) == null)
+      {
+         ComponentType type = new ComponentType(mc.type(), mc.subtype());
+         MutableManagedComponent comp = new ManagedComponentImpl(type, md, mo);
+         
+         if(mo.getTransientAttachment(MBeanRuntimeComponentDispatcher.class.getName()) == null)
+            comp = this.proxyFactory.createComponentProxy(comp);
+         
+         md.addComponent(mo.getName(), comp);
+         log.debug("Processing ManagementComponent("+mo.getName()+"): "+comp);
+         Set<ManagedComponent> typeComps = compByCompType.get(type);
+         if (typeComps == null)
+         {
+            typeComps = new HashSet<ManagedComponent>();
+            compByCompType.put(type, typeComps);
+         }
+         typeComps.add(comp);
+         RunState state = updateRunState(mo, comp);
+      }
+
       ManagementObject managementObject = (ManagementObject) moAnns.get(ManagementObject.class.getName());
       if (managementObject != null && managementObject.isRuntime())
       {
          boolean merged = false;
-         ManagementComponent mc = managementObject.componentType();
-         boolean isMC = !(mc.type().length() == 0 && mc.subtype().length() == 0);
+         ManagementComponent component = managementObject.componentType();
+         boolean isMC = !(component.type().length() == 0 && component.subtype().length() == 0);
 
          // Merge this with the ManagedObject
          ManagedObject parentMO = moRegistry.get(key);
@@ -745,28 +768,6 @@
       // Check for unresolved refs
       checkForReferences(key, mo);
 
-      // Create ManagedComponents for ManagedObjects annotated with ManagementComponent
-      ManagementComponent mc = (ManagementComponent) moAnns.get(ManagementComponent.class.getName());
-      if (mc != null && md.getComponent(mo.getName()) == null)
-      {
-         ComponentType type = new ComponentType(mc.type(), mc.subtype());
-         MutableManagedComponent comp = new ManagedComponentImpl(type, md, mo);
-         
-         if(mo.getTransientAttachment(MBeanRuntimeComponentDispatcher.class.getName()) == null)
-            comp = this.proxyFactory.createComponentProxy(comp);
-         
-         md.addComponent(mo.getName(), comp);
-         log.debug("Processing ManagementComponent("+mo.getName()+"): "+comp);
-         Set<ManagedComponent> typeComps = compByCompType.get(type);
-         if (typeComps == null)
-         {
-            typeComps = new HashSet<ManagedComponent>();
-            compByCompType.put(type, typeComps);
-         }
-         typeComps.add(comp);
-         RunState state = updateRunState(mo, comp);
-      }
-
       // Scan for @ManagementObjectRef
       for(ManagedProperty prop : mo.getProperties().values())
       {