# HG changeset patch
# User minqi
# Date 1349740784 25200
# Node ID 0e8ca886e4e101de0ae5c25cd9a22086ed92125c
# Parent  7a40901e0d5c7e0e91030f1e536803b21c63437d# Parent  75982791ddb6c13b1798b60bae645996002a22a2
Merge

diff -r 75982791ddb6 -r 0e8ca886e4e1 agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ClassWriter.java
--- a/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ClassWriter.java	Mon Oct 08 09:18:54 2012 -0400
+++ b/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ClassWriter.java	Mon Oct 08 16:59:44 2012 -0700
@@ -354,15 +354,14 @@
     }
 
     protected void writeFields() throws IOException {
-        U2Array fields = klass.getFields();
-        final int length = (int) fields.length();
+        final int javaFieldsCount = klass.getJavaFieldsCount();
 
         // write number of fields
-        dos.writeShort((short) length);
+        dos.writeShort((short) javaFieldsCount);
 
-        if (DEBUG) debugMessage("number of fields = " + length);
+        if (DEBUG) debugMessage("number of fields = " + javaFieldsCount);
 
-        for (int index = 0; index < length; index++) {
+        for (int index = 0; index < javaFieldsCount; index++) {
             short accessFlags    = klass.getFieldAccessFlags(index);
             dos.writeShort(accessFlags & (short) JVM_RECOGNIZED_FIELD_MODIFIERS);
 
diff -r 75982791ddb6 -r 0e8ca886e4e1 agent/src/share/native/sadis.c
--- a/agent/src/share/native/sadis.c	Mon Oct 08 09:18:54 2012 -0400
+++ b/agent/src/share/native/sadis.c	Mon Oct 08 16:59:44 2012 -0700
@@ -46,7 +46,7 @@
 
 #else
 
-#include <strings.h>
+#include <string.h>
 #include <dlfcn.h>
 #include <link.h>