[jboss-cvs] JBoss Messaging SVN: r7650 - in trunk/src/main/org/jboss/messaging/jms/server/management: jmx/impl and 1 other directory.

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

Author: jmesnil
Date: 2009-07-31 09:06:27 -0400 (Fri, 31 Jul 2009)
New Revision: 7650

Modified:
   trunk/src/main/org/jboss/messaging/jms/server/management/impl/JMSServerControlImpl.java
   trunk/src/main/org/jboss/messaging/jms/server/management/jmx/impl/ReplicationAwareJMSServerControlWrapper.java
Log:
fixed JMX notifications for JMSServerControl

Modified: trunk/src/main/org/jboss/messaging/jms/server/management/impl/JMSServerControlImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/server/management/impl/JMSServerControlImpl.java	2009-07-31 13:05:46 UTC (rev 7649)
+++ trunk/src/main/org/jboss/messaging/jms/server/management/impl/JMSServerControlImpl.java	2009-07-31 13:06:27 UTC (rev 7650)
@@ -126,6 +126,19 @@
       return pairs;
    }
 
+   public static MBeanNotificationInfo[] getNotificationInfos()
+   {
+      NotificationType[] values = NotificationType.values();
+      String[] names = new String[values.length];
+      for (int i = 0; i < values.length; i++)
+      {
+         names[i] = values[i].toString();
+      }
+      return new MBeanNotificationInfo[] { new MBeanNotificationInfo(names,
+                                                                     JMSServerControl.class.getName(),
+                                                                     "Notifications emitted by a JMS Server") };
+   }
+
    // Constructors --------------------------------------------------
 
    public JMSServerControlImpl(final JMSServerManager server)
@@ -688,15 +701,7 @@
 
    public MBeanNotificationInfo[] getNotificationInfo()
    {
-      NotificationType[] values = NotificationType.values();
-      String[] names = new String[values.length];
-      for (int i = 0; i < values.length; i++)
-      {
-         names[i] = values[i].toString();
-      }
-      return new MBeanNotificationInfo[] { new MBeanNotificationInfo(names,
-                                                                     this.getClass().getName(),
-                                                                     "Notifications emitted by a JMS Server") };
+      return getNotificationInfos();
    }
 
    public String[] listRemoteAddresses() throws Exception

Modified: trunk/src/main/org/jboss/messaging/jms/server/management/jmx/impl/ReplicationAwareJMSServerControlWrapper.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/server/management/jmx/impl/ReplicationAwareJMSServerControlWrapper.java	2009-07-31 13:05:46 UTC (rev 7649)
+++ trunk/src/main/org/jboss/messaging/jms/server/management/jmx/impl/ReplicationAwareJMSServerControlWrapper.java	2009-07-31 13:06:27 UTC (rev 7650)
@@ -37,6 +37,7 @@
 import org.jboss.messaging.core.management.jmx.impl.ReplicationAwareStandardMBeanWrapper;
 import org.jboss.messaging.jms.server.management.JMSServerControl;
 import org.jboss.messaging.jms.server.management.impl.JMSServerControlImpl;
+import org.jboss.messaging.jms.server.management.impl.JMSServerControlImpl.NotificationType;
 
 /**
  * A ReplicationAwareJMSServerControlWrapper
@@ -581,7 +582,7 @@
 
    public MBeanNotificationInfo[] getNotificationInfo()
    {
-      return localControl.getNotificationInfo();
+      return JMSServerControlImpl.getNotificationInfos();
    }
 
    // StandardMBean overrides ---------------------------------------
@@ -595,7 +596,7 @@
                            info.getAttributes(),
                            info.getConstructors(),
                            MBeanInfoHelper.getMBeanOperationsInfo(JMSServerControl.class),
-                           localControl.getNotificationInfo());
+                           getNotificationInfo());
    }
 
    // Public --------------------------------------------------------