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

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

Author: thauser at redhat.com
Date: 2010-12-02 10:57:42 -0500 (Thu, 02 Dec 2010)
New Revision: 109647

Modified:
   branches/snmp4j-integration-1.11.1/varia/src/main/java/org/jboss/jmx/adaptor/snmp/trapd/TrapdService.java
Log:
cleanup of comments, correction of PDU type for V2 traps.

Modified: branches/snmp4j-integration-1.11.1/varia/src/main/java/org/jboss/jmx/adaptor/snmp/trapd/TrapdService.java
===================================================================
--- branches/snmp4j-integration-1.11.1/varia/src/main/java/org/jboss/jmx/adaptor/snmp/trapd/TrapdService.java	2010-12-02 15:13:53 UTC (rev 109646)
+++ branches/snmp4j-integration-1.11.1/varia/src/main/java/org/jboss/jmx/adaptor/snmp/trapd/TrapdService.java	2010-12-02 15:57:42 UTC (rev 109647)
@@ -188,9 +188,6 @@
       throws Exception
    {
 	   snmp.close();
-	 
-//      this.trapSession.close();
-//      this.trapSession = null; // gc
    }
    
    /**
@@ -207,7 +204,6 @@
 
 	@Override
 	public void processPdu(CommandResponderEvent e) {
-//		PDUv1 pdu = (PDUv1)e.getPDU();
 		PDU pdu = e.getPDU();
 		if (pdu != null){
 			
@@ -229,7 +225,6 @@
 	
 	private void processPDUv2c(PDU pdu){
 	      StringBuffer sbuf = new StringBuffer();
-	      //sbuf.append("\n***************NEW SNMP4J ADAPTOR******************");
 	      sbuf.append("\nV2 Trap from agent ").append(this.bindAddress.toString());
 	      sbuf.append(" on port ").append(this.port);
 	      sbuf.append("\n");
@@ -242,7 +237,6 @@
 	         VariableBinding vb = (VariableBinding)it.next();
 	         if (vb != null) {
 		         sbuf.append("Varbind[").append(counter++).append("] := ");
-//		         sbuf.append(vb.toString());
 		         sbuf.append(vb.getOid().toString()).append(" --> ");
 		         sbuf.append(vb.getVariable().toString()).append("\n");
 	         }
@@ -254,10 +248,8 @@
 	private void processScopedPDU(ScopedPDU pdu) {
 		//****
 	      StringBuffer sbuf = new StringBuffer();
-	      //sbuf.append("\n***************NEW SNMP4J ADAPTOR******************");
 	      sbuf.append("\nV3 Trap from agent ").append(this.bindAddress.toString());
 	      sbuf.append(" on port ").append(this.port);
-	      //sbuf.append("\nCommunity string... ").append(community.toString());
 	      sbuf.append("\n");
 		
 	      Vector bindings = pdu.getVariableBindings();
@@ -268,7 +260,6 @@
 	         VariableBinding vb = (VariableBinding)it.next();
 	         if (vb != null) {
 		         sbuf.append("Varbind[").append(counter++).append("] := ");
-//		         sbuf.append(vb.toString());
 		         sbuf.append(vb.getOid().toString()).append(" --> ");
 		         sbuf.append(vb.getVariable().toString()).append("\n");
 	         }
@@ -279,9 +270,7 @@
 	}
 
 	private void processPDUv1(PDUv1 pdu) {
-		//*****
 	      StringBuffer sbuf = new StringBuffer();
-	      //sbuf.append("\n***************NEW SNMP4J ADAPTOR******************");
 	      sbuf.append("\nV1 Trap from agent ").append(this.bindAddress.toString());
 	      sbuf.append(" on port ").append(this.port);
 	      sbuf.append("\nIP Address......... ").append(pdu.getAgentAddress().toString());
@@ -290,7 +279,6 @@
 	      sbuf.append("\nSpecific .......... ").append(pdu.getSpecificTrap());
 	      sbuf.append("\nTimeStamp ......... ").append(pdu.getTimestamp());
 	      
-	      //sbuf.append("\nCommunity string... ").append(community.toString());
 	      sbuf.append("\n");
 		
 	      Vector bindings = pdu.getVariableBindings();
@@ -301,7 +289,6 @@
 	         VariableBinding vb = (VariableBinding)it.next();
 	         if (vb != null) {
 		         sbuf.append("Varbind[").append(counter++).append("] := ");
-//		         sbuf.append(vb.toString());
 		         sbuf.append(vb.getOid().toString()).append(" --> ");
 		         sbuf.append(vb.getVariable().toString()).append("\n");
 	         }