--- old/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeWideable.java	Fri Jul  8 15:22:35 2011
+++ new/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeWideable.java	Fri Jul  8 15:22:35 2011
@@ -38,7 +38,6 @@
 
   // the local variable index
   public int getLocalVarIndex() {
-    return (isWide()) ? (int) (0xFFFF & javaShortAt(1))
-            : (int) (0xFF & javaByteAt(1));
+    return (isWide()) ? getIndexU2(code(), true) : getIndexU1();
   }
 }