OpenJDK / jdk / jdk
changeset 31767:9e852cddac44
Merge
| author | amurillo |
|---|---|
| date | Fri, 17 Jul 2015 08:46:52 -0700 |
| parents | 7c577fda1855 3f6852163e6d |
| children | b8f3768faa46 |
| files | |
| diffstat | 2 files changed, 6 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/make/jprt.properties Wed Jul 05 20:42:39 2017 +0200 +++ b/make/jprt.properties Fri Jul 17 08:46:52 2015 -0700 @@ -121,10 +121,11 @@ ${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 ########
--- a/test/lib/share/classes/jdk/test/lib/hprof/model/Snapshot.java Wed Jul 05 20:42:39 2017 +0200 +++ b/test/lib/share/classes/jdk/test/lib/hprof/model/Snapshot.java Fri Jul 17 08:46:52 2015 -0700 @@ -276,10 +276,8 @@ 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())) {