Mercurial > hg > jdk9-shenandoah
changeset 1594:571788f53574
Merge
author | amurillo |
---|---|
date | Tue, 21 Jul 2015 09:19:17 -0700 |
parents | 8f72b3d8805e (diff) fa8b91ef00bf (current diff) |
children | 8fd6eeb87860 |
files | |
diffstat | 2 files changed, 6 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/make/jprt.properties Mon Jul 20 20:45:58 2015 +0800 +++ b/make/jprt.properties Tue Jul 21 09:19:17 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 Mon Jul 20 20:45:58 2015 +0800 +++ b/test/lib/share/classes/jdk/test/lib/hprof/model/Snapshot.java Tue Jul 21 09:19:17 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())) {