# HG changeset patch
# User amurillo
# Date 1437148012 25200
# Node ID 8f72b3d8805e6722e15a331208b4e069c9c13697
# Parent  57f3134853ecdd4a3ee2d4d26f22ba981d653d79# Parent  39b1000561b9d62c0c385cf0a59e7876a863c958
Merge

diff -r 57f3134853ec -r 8f72b3d8805e make/jprt.properties
--- a/make/jprt.properties	Thu Jul 16 19:27:39 2015 -0700
+++ b/make/jprt.properties	Fri Jul 17 08:46:52 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
 
 ########
diff -r 57f3134853ec -r 8f72b3d8805e test/lib/share/classes/jdk/test/lib/hprof/model/Snapshot.java
--- a/test/lib/share/classes/jdk/test/lib/hprof/model/Snapshot.java	Thu Jul 16 19:27:39 2015 -0700
+++ b/test/lib/share/classes/jdk/test/lib/hprof/model/Snapshot.java	Fri Jul 17 08:46:52 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())) {