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:
Alejandro Murillo 2015-07-17 08:46:52 -07:00
commit d7f6a3ef78
2 changed files with 6 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.fastdebugOpen.build.configure.args}
jprt.i586.productOpen.build.configure.args= \ jprt.i586.productOpen.build.configure.args= \
${my.i586.default.build.configure.args} \ ${my.i586.default.build.configure.args} \
${jprt.productOpen.build.configure.args}jprt.windows_i586.build.configure.args= \ ${jprt.productOpen.build.configure.args}
--with-devkit=$VS2013_HOME \ jprt.windows_i586.build.configure.args= \
--with-devkit=$VS2013_HOME \
${jprt.i586.build.configure.args} ${jprt.i586.build.configure.args}
jprt.windows_x64.build.configure.args= \ jprt.windows_x64.build.configure.args= \
--with-devkit=$VS2013_HOME --with-devkit=$VS2013_HOME
######## ########

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(); fakeClasses.clear();
weakReferenceClass = findClass("java.lang.ref.Reference"); weakReferenceClass = findClass("java.lang.ref.Reference");
if (weakReferenceClass == null) { // JDK 1.1.x referentFieldIndex = 0;
weakReferenceClass = findClass("sun.misc.Ref"); if (weakReferenceClass != null) {
referentFieldIndex = 0;
} else {
JavaField[] fields = weakReferenceClass.getFieldsForInstance(); JavaField[] fields = weakReferenceClass.getFieldsForInstance();
for (int i = 0; i < fields.length; i++) { for (int i = 0; i < fields.length; i++) {
if ("referent".equals(fields[i].getName())) { if ("referent".equals(fields[i].getName())) {