[jboss-cvs] JBossAS SVN: r111781 - branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent.

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

Author: thauser at redhat.com
Date: 2011-07-19 16:53:48 -0400 (Tue, 19 Jul 2011)
New Revision: 111781

Modified:
   branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/SnmpAgentService.java
   branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/SnmpAgentServiceMBean.java
Log:
merge from mobicents


Modified: branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/SnmpAgentService.java
===================================================================
--- branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/SnmpAgentService.java	2011-07-19 20:45:56 UTC (rev 111780)
+++ branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/SnmpAgentService.java	2011-07-19 20:53:48 UTC (rev 111781)
@@ -31,7 +31,6 @@
 import javax.management.Notification;
 import javax.management.ObjectName;
 
-import org.jboss.jmx.adaptor.snmp.config.attribute.AttributeMappings;
 import org.jboss.jmx.adaptor.snmp.config.attribute.ManagedBean;
 import org.jboss.jmx.adaptor.snmp.config.notification.Mapping;
 import org.jboss.jmx.adaptor.snmp.config.user.User;
@@ -792,15 +791,21 @@
 	}
 
 	@Override
-	public void sendSNMPNotification(String type, Map<String, Object> userData) {
-		Notification n = new Notification(type, this, getNextNotificationSequenceNumber());
-		n.setUserData(userData);
+	public void sendJMXNotification(Notification notification) {
+		if(notification.getSequenceNumber() <= 0) {
+			notification.setSequenceNumber(getNextNotificationSequenceNumber());
+		}
 		try {
-			this.trapEmitter.send(n);           
+			this.trapEmitter.send(notification);           
 	    } catch (Exception e) {
 	         log.error("Problem occured while Sending trap", e);
 	    }   		
 	}
+	
+	@Override
+	public long getNextJMXNotificationSequenceNumber() {		
+		return getNextNotificationSequenceNumber();
+	}
 
 	@Override
 	public void addAttributeMappings(List<ManagedBean> mappings) {

Modified: branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/SnmpAgentServiceMBean.java
===================================================================
--- branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/SnmpAgentServiceMBean.java	2011-07-19 20:45:56 UTC (rev 111780)
+++ branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/SnmpAgentServiceMBean.java	2011-07-19 20:53:48 UTC (rev 111781)
@@ -120,7 +120,8 @@
    /**
     * 
     */
-   void sendSNMPNotification(String type, Map<String, Object> userData);
+   void sendJMXNotification(Notification notification);
+   long getNextJMXNotificationSequenceNumber();
    
    void addAttributeMappings(List<ManagedBean> mappings);
    void removeAttributeMappings(List<ManagedBean> mappings);