stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Lana Steuck 2015-07-23 15:27:17 -07:00
commit 9a855ab7d2
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
make/jprt.properties
View File

@ -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
########

5
modules.xml
View File

@ -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>

6
test/lib/share/classes/jdk/test/lib/hprof/model/Snapshot.java
View File

@ -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())) {