[jboss-cvs] JBossAS SVN: r111597 - 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:52:53 -0400 (Mon, 13 Jun 2011)
New Revision: 111597

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

Modified: branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/NotificationWrapperSupport.java
===================================================================
--- branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/NotificationWrapperSupport.java	2011-06-13 20:51:52 UTC (rev 111596)
+++ branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/NotificationWrapperSupport.java	2011-06-13 20:52:53 UTC (rev 111597)
@@ -38,7 +38,7 @@
    implements NotificationWrapper
 {
     /** Holds the notification payload keyed on the attibute name */
-    protected Map payload = new HashMap();
+    protected Map<String, Object> payload = new HashMap<String, Object>();
     
     /** Provides uptime */
     protected Clock clock;
@@ -70,7 +70,7 @@
            new DynamicContentAccessor() {
               public Object get()
               {
-                 return new Long(NotificationWrapperSupport.this.clock.uptime());
+                 return Long.valueOf(NotificationWrapperSupport.this.clock.uptime());
               }
            });
 
@@ -78,7 +78,7 @@
            new DynamicContentAccessor() {
               public Object get()
               {
-                 return new Long(NotificationWrapperSupport.this.trapCount.peek());
+                 return Long.valueOf(NotificationWrapperSupport.this.trapCount.peek());
               }
            });
    }
@@ -106,9 +106,9 @@
       // that previous content may be overwritten if the same keys as above 
       // are used
       Object userData = n.getUserData();
-      if (userData instanceof HashMap) {
+      if (userData instanceof Map) {
          // Copy all of the user data in the payload
-         this.payload.putAll((HashMap)userData);    
+         this.payload.putAll((Map)userData);    
       }
    } // prime