[jboss-cvs] JBossAS SVN: r111603 - 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-06-13 16:57:16 -0400 (Mon, 13 Jun 2011)
New Revision: 111603

Modified:
   branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/SnmpVarBindFactory.java
Log:
merging changes from Mobicents

Modified: branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/SnmpVarBindFactory.java
===================================================================
--- branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/SnmpVarBindFactory.java	2011-06-13 20:56:47 UTC (rev 111602)
+++ branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/SnmpVarBindFactory.java	2011-06-13 20:57:16 UTC (rev 111603)
@@ -49,7 +49,7 @@
    private static final Logger log = Logger.getLogger(SnmpVarBindFactory.class);
    
    /** Contains "type - maker" tupples */
-   private Map makers = new HashMap();
+   private Map<String, Maker> makers = new HashMap<String, Maker>();
 
    /** Default Maker */
    private final Maker defaultMaker = new SnmpObjectMaker();
@@ -60,9 +60,10 @@
    **/        
    public SnmpVarBindFactory()
    {
+	  makers.put("java.lang.Boolean", new SnmpBooleanMaker());
       makers.put("java.lang.String", new SnmpOctetStringMaker());
       makers.put("java.lang.Integer", new SnmpInt32Maker());
-      makers.put("java.lang.Long", new SnmpCounter32Maker());
+      makers.put("java.lang.Long", new SnmpLongMaker());
       makers.put("java.math.BigInteger", new SnmpCounter64Maker());
       makers.put("java.util.Date", new SnmpDateMaker());
    }
@@ -116,9 +117,30 @@
    } // class SnmpInt32Maker
    
    /**
+    * Generates unsigned integer SNMP variable bindings
+   **/         
+   class SnmpBooleanMaker
+      implements Maker
+   {
+      public VariableBinding make(String oid, Object value) 
+         throws MappingFailedException
+      {
+         Boolean b = (Boolean)value;
+         
+         Integer32 result;
+         if(((Boolean)b).booleanValue())
+        	 result = new Integer32(1);
+         else 
+        	 result = new Integer32(0);
+         
+         return new VariableBinding(new OID(oid), result);
+      }
+   } // class SnmpBooleanMaker
+   
+   /**
     * Generates unsigned long integer SNMP variable bindings
    **/         
-   class SnmpCounter32Maker
+   class SnmpLongMaker
       implements Maker
    {
       public VariableBinding make(String oid, Object value) 
@@ -127,7 +149,7 @@
          Long l = (Long)value;
             
          return new VariableBinding(new OID(oid), 
-                                new Counter32(l.longValue()));
+                                new OctetString(l.toString()));
       }
    } // class SnmpCounter64Maker