From c797c78253a8f3fca6fc665fe474b79332a65d4e Mon Sep 17 00:00:00 2001 From: Katja Kantserova Date: Thu, 9 Jul 2015 12:56:38 +0200 Subject: [PATCH 1/2] 8032763: Remove use of sun.misc.Ref from hprof parser in testlibrary Reviewed-by: jbachorik, alanb --- .../share/classes/jdk/test/lib/hprof/model/Snapshot.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/test/lib/share/classes/jdk/test/lib/hprof/model/Snapshot.java b/test/lib/share/classes/jdk/test/lib/hprof/model/Snapshot.java index 635c0baa9a0..6150543b36b 100644 --- a/test/lib/share/classes/jdk/test/lib/hprof/model/Snapshot.java +++ b/test/lib/share/classes/jdk/test/lib/hprof/model/Snapshot.java @@ -276,10 +276,8 @@ public class Snapshot implements AutoCloseable { fakeClasses.clear(); weakReferenceClass = findClass("java.lang.ref.Reference"); - if (weakReferenceClass == null) { // JDK 1.1.x - weakReferenceClass = findClass("sun.misc.Ref"); - referentFieldIndex = 0; - } else { + referentFieldIndex = 0; + if (weakReferenceClass != null) { JavaField[] fields = weakReferenceClass.getFieldsForInstance(); for (int i = 0; i < fields.length; i++) { if ("referent".equals(fields[i].getName())) { From b063fde5045359954c2fd2b363536111fab01f15 Mon Sep 17 00:00:00 2001 From: "Daniel D. Daugherty" Date: Tue, 14 Jul 2015 09:36:38 -0700 Subject: [PATCH 2/2] 8131128: Merge error in jprt.properties leads to missing devkit argument Add missing line break; fix backslash lineup. Reviewed-by: tbell, kvn --- make/jprt.properties | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/make/jprt.properties b/make/jprt.properties index b0d59a51b18..e882b8a21a9 100644 --- a/make/jprt.properties +++ b/make/jprt.properties @@ -121,10 +121,11 @@ jprt.i586.fastdebugOpen.build.configure.args= \ ${jprt.fastdebugOpen.build.configure.args} jprt.i586.productOpen.build.configure.args= \ ${my.i586.default.build.configure.args} \ - ${jprt.productOpen.build.configure.args}jprt.windows_i586.build.configure.args= \ - --with-devkit=$VS2013_HOME \ + ${jprt.productOpen.build.configure.args} +jprt.windows_i586.build.configure.args= \ + --with-devkit=$VS2013_HOME \ ${jprt.i586.build.configure.args} -jprt.windows_x64.build.configure.args= \ +jprt.windows_x64.build.configure.args= \ --with-devkit=$VS2013_HOME ########