From: <do...@hy...> - 2009-08-21 17:31:20
|
Author: dougm Date: 2009-08-21 10:31:10 -0700 (Fri, 21 Aug 2009) New Revision: 13653 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=13653 Modified: trunk/src/org/hyperic/snmp/MIBTree.java Log: [HHQ-3352] Convert quoted strings to OID Modified: trunk/src/org/hyperic/snmp/MIBTree.java =================================================================== --- trunk/src/org/hyperic/snmp/MIBTree.java 2009-08-21 08:15:00 UTC (rev 13652) +++ trunk/src/org/hyperic/snmp/MIBTree.java 2009-08-21 17:31:10 UTC (rev 13653) @@ -44,6 +44,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.snmp4j.smi.OctetString; /** * MIB file parser intended ONLY for @@ -286,7 +287,17 @@ scratch[ix++] = Integer.parseInt(node); } else { - int[] subnode = getOID(node); + int[] subnode; + int len = node.length()-1; + //see: http://www.snmp4j.org/doc/org/snmp4j/smi/OID.html#OID(java.lang.String) + final char quote = '\''; + if ((node.charAt(0) == quote) && (node.charAt(len) == quote)) { + node = node.substring(1, len); + subnode = new OctetString(node).toSubIndex(false).getValue(); + } + else { + subnode = getOID(node); + } if (subnode == null) { return null; } |