changeset 1591:b82c27650a7e

Merge
author jbachorik
date Fri, 10 Jul 2015 16:37:18 +0200
parents bb77b3156c6e (diff) 19173ee3553e (current diff)
children 39b1000561b9
files
diffstat 1 files changed, 2 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/test/lib/share/classes/jdk/test/lib/hprof/model/Snapshot.java	Thu Jul 09 22:46:15 2015 -0700
+++ b/test/lib/share/classes/jdk/test/lib/hprof/model/Snapshot.java	Fri Jul 10 16:37:18 2015 +0200
@@ -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())) {