Mercurial > hg > jdk9-shenandoah
changeset 1595:8fd6eeb87860 jdk9-b75
Merge
author | lana |
---|---|
date | Thu, 23 Jul 2015 15:27:17 -0700 |
parents | 887a2657adef (current diff) 571788f53574 (diff) |
children | 2de723be58cf b9aba99deb2d 2671addb3319 |
files | |
diffstat | 3 files changed, 11 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/make/jprt.properties Thu Jul 23 11:54:23 2015 -0700 +++ b/make/jprt.properties Thu Jul 23 15:27: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/modules.xml Thu Jul 23 11:54:23 2015 -0700 +++ b/modules.xml Thu Jul 23 15:27:17 2015 -0700 @@ -1777,6 +1777,11 @@ <name>jdk.policytool</name> <depend>java.base</depend> <depend>java.desktop</depend> + <depend>java.logging</depend> + <depend>java.management</depend> + <depend>java.security.jgss</depend> + <depend>java.sql</depend> + <depend>jdk.security.jgss</depend> </module> <module> <name>jdk.rmic</name>
--- a/test/lib/share/classes/jdk/test/lib/hprof/model/Snapshot.java Thu Jul 23 11:54:23 2015 -0700 +++ b/test/lib/share/classes/jdk/test/lib/hprof/model/Snapshot.java Thu Jul 23 15:27: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())) {