[jboss-cvs] JBossAS SVN: r111786 - 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 17:02:12 -0400 (Tue, 19 Jul 2011)
New Revision: 111786

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

Modified: branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/AttributeTableMapper.java
===================================================================
--- branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/AttributeTableMapper.java	2011-07-19 21:01:16 UTC (rev 111785)
+++ branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/AttributeTableMapper.java	2011-07-19 21:02:12 UTC (rev 111786)
@@ -92,7 +92,7 @@
 	}
 	
 	public OID getNextTable(OID oid) {
-		OID currentOID = oid;
+		OID currentOID = (OID) oid.clone();
 		// means that the oid is the one from the table itself
 		boolean isRowEntry = false;
 		if(tables.contains(oid)) {
@@ -120,7 +120,7 @@
 		OID tableIndexOID = be.getTableIndexOID();
 		if(tableIndexOID == null) {
 			if(val instanceof Map) {
-				Set<Object> keySet = ((Map)val).keySet();
+				Set<Object> keySet = new TreeSet(((Map)val).keySet());
 				if(keySet.size() > 0) {
 					return new OID(currentOID.append("'" + keySet.iterator().next().toString() + "'"));
 				} else {
@@ -165,7 +165,7 @@
 //				}
 //		} else {
 				String key = new String(tableIndexOID.toByteArray());
-				Iterator<Object> keySet = ((Map)val).keySet().iterator();
+				Iterator<Object> keySet = new TreeSet(((Map)val).keySet()).iterator();
 				while (keySet.hasNext()) {
 					Object entryKey = keySet.next();
 					if(entryKey.equals(key)) {