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

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

Author: thauser at redhat.com
Date: 2010-11-30 16:57:29 -0500 (Tue, 30 Nov 2010)
New Revision: 109574

Modified:
   branches/snmp4j-integration-1.11.1/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/TrapEmitter.java
   branches/snmp4j-integration-1.11.1/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/TrapFactory.java
   branches/snmp4j-integration-1.11.1/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/TrapFactorySupport.java
Log:
change to the correct PDU type for V2c.

Modified: branches/snmp4j-integration-1.11.1/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/TrapEmitter.java
===================================================================
--- branches/snmp4j-integration-1.11.1/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/TrapEmitter.java	2010-11-30 21:57:06 UTC (rev 109573)
+++ branches/snmp4j-integration-1.11.1/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/TrapEmitter.java	2010-11-30 21:57:29 UTC (rev 109574)
@@ -43,6 +43,7 @@
 
 import org.snmp4j.CommunityTarget;
 import org.snmp4j.PDUv1;
+import org.snmp4j.PDU;
 import org.snmp4j.ScopedPDU;
 import org.snmp4j.Target;
 import org.snmp4j.Snmp;
@@ -172,7 +173,7 @@
            
       // Cache the translated notification
       PDUv1 v1TrapPdu = null; 
-      ScopedPDU v2cTrapPdu = null; 
+      PDU v2cTrapPdu = null; 
       ScopedPDU v3TrapPdu = null;
       
       //The snmp session

Modified: branches/snmp4j-integration-1.11.1/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/TrapFactory.java
===================================================================
--- branches/snmp4j-integration-1.11.1/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/TrapFactory.java	2010-11-30 21:57:06 UTC (rev 109573)
+++ branches/snmp4j-integration-1.11.1/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/TrapFactory.java	2010-11-30 21:57:29 UTC (rev 109574)
@@ -22,6 +22,7 @@
 import javax.management.Notification;
 
 import org.snmp4j.PDUv1;
+import org.snmp4j.PDU;
 import org.snmp4j.ScopedPDU;
 
 /**
@@ -93,7 +94,7 @@
    **/
 //   public SnmpPduPacket generateV2Trap(Notification n) 
 //      throws MappingFailedException;
-   public ScopedPDU generateV2cTrap(Notification n) 
+   public PDU generateV2cTrap(Notification n) 
    throws MappingFailedException;
 
    /**

Modified: branches/snmp4j-integration-1.11.1/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/TrapFactorySupport.java
===================================================================
--- branches/snmp4j-integration-1.11.1/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/TrapFactorySupport.java	2010-11-30 21:57:06 UTC (rev 109573)
+++ branches/snmp4j-integration-1.11.1/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/TrapFactorySupport.java	2010-11-30 21:57:29 UTC (rev 109574)
@@ -345,7 +345,7 @@
     *
     * TODO: how do you get timestamp, generic, and specific stuff in the trap
    **/
-   public ScopedPDU generateV2cTrap(Notification n) 
+   public PDU generateV2cTrap(Notification n) 
       throws MappingFailedException
    {
       if (log.isTraceEnabled())
@@ -367,7 +367,7 @@
       Mapping m = (Mapping)this.notificationMapList.get(index);
       
       // Create trap
-      ScopedPDU trapPdu = new ScopedPDU();
+      PDU trapPdu = new ScopedPDU();
       trapPdu.setType(PDU.TRAP);
         
       // Append the specified varbinds. Get varbinds from mapping and for