changeset 13073:85c9ddeda1c3

Merge
author amurillo
date Fri, 13 Nov 2015 10:35:27 -0800
parents 2891d078c753 11a5502a6da9
children dab5b1929083 fcc446aa192b
files
diffstat 10 files changed, 25 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/src/jdk.jdi/share/classes/com/sun/tools/jdi/InvokableTypeImpl.java	Fri Nov 13 12:00:23 2015 -0500
+++ b/src/jdk.jdi/share/classes/com/sun/tools/jdi/InvokableTypeImpl.java	Fri Nov 13 10:35:27 2015 -0800
@@ -236,6 +236,15 @@
                                            final MethodImpl method,
                                            final ValueImpl[] args,
                                            final int options) {
+        /*
+         * Cache the values of args when TRACE_SENDS is enabled, for later printing.
+         * If not cached, printing causes a remote call while synchronized, and deadlock.
+         */
+        if ((vm.traceFlags & VirtualMachineImpl.TRACE_SENDS) != 0) {
+           for (ValueImpl arg: args) {
+              arg.toString();
+           }
+        }
         CommandSender sender = getInvokeMethodSender(thread, method, args, options);
         PacketStream stream;
         if ((options & ClassType.INVOKE_SINGLE_THREADED) != 0) {
--- a/src/jdk.jdi/share/classes/com/sun/tools/jdi/VirtualMachineImpl.java	Fri Nov 13 12:00:23 2015 -0500
+++ b/src/jdk.jdi/share/classes/com/sun/tools/jdi/VirtualMachineImpl.java	Fri Nov 13 10:35:27 2015 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1041,12 +1041,11 @@
     }
 
     Type findBootType(String signature) throws ClassNotLoadedException {
-        List<ReferenceType> types = allClasses();
+        List<ReferenceType> types = retrieveClassesBySignature(signature);
         Iterator<ReferenceType> iter = types.iterator();
         while (iter.hasNext()) {
             ReferenceType type = iter.next();
-            if ((type.classLoader() == null) &&
-                (type.signature().equals(signature))) {
+            if (type.classLoader() == null) {
                 return type;
             }
         }
--- a/test/TEST.ROOT	Fri Nov 13 12:00:23 2015 -0500
+++ b/test/TEST.ROOT	Fri Nov 13 10:35:27 2015 -0800
@@ -26,5 +26,9 @@
 # Allow querying of sun.arch.data.model in @requires clauses
 requires.properties=sun.arch.data.model 
 
-# Tests using jtreg 4.1 b11 features
-requiredVersion=4.1 b11
+# Tests using jtreg 4.1 b12 features
+requiredVersion=4.1 b12
+
+# Path to libraries in the topmost test directory. This is needed so @library
+# does not need ../../ notation to reach them
+external.lib.roots = ../../
--- a/test/com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.java	Fri Nov 13 12:00:23 2015 -0500
+++ b/test/com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.java	Fri Nov 13 10:35:27 2015 -0800
@@ -38,7 +38,7 @@
  * @bug 6455258
  * @summary Sanity test for com.sun.management.HotSpotDiagnosticMXBean.dumpHeap method
  * @library /lib/testlibrary
- * @library /../../test/lib/share/classes
+ * @library /test/lib/share/classes
  * @build jdk.testlibrary.*
  * @build jdk.test.lib.hprof.*
  * @build jdk.test.lib.hprof.module.*
--- a/test/java/util/Arrays/TimSortStackSize2.java	Fri Nov 13 12:00:23 2015 -0500
+++ b/test/java/util/Arrays/TimSortStackSize2.java	Fri Nov 13 10:35:27 2015 -0800
@@ -24,7 +24,7 @@
 /*
  * @test
  * @bug 8072909
- * @library /lib/testlibrary /../../test/lib
+ * @library /lib/testlibrary /test/lib
  * @build jdk.testlibrary.*
  * @build TimSortStackSize2
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/sun/jvmstat/monitor/MonitoredVm/TestPollingInterval.java	Fri Nov 13 12:00:23 2015 -0500
+++ b/test/sun/jvmstat/monitor/MonitoredVm/TestPollingInterval.java	Fri Nov 13 10:35:27 2015 -0800
@@ -42,7 +42,7 @@
  * @summary setInterval() for local MonitoredHost and local MonitoredVm
  * @modules jdk.jvmstat/sun.jvmstat.monitor
  * @library /lib/testlibrary
- * @library /../../test/lib/share/classes
+ * @library /test/lib/share/classes
  * @build jdk.testlibrary.*
  * @build jdk.test.lib.apps.*
  * @run main TestPollingInterval
--- a/test/sun/tools/jhsdb/BasicLauncherTest.java	Fri Nov 13 12:00:23 2015 -0500
+++ b/test/sun/tools/jhsdb/BasicLauncherTest.java	Fri Nov 13 10:35:27 2015 -0800
@@ -24,7 +24,7 @@
 /*
  * @test
  * @summary Basic test for jhsdb launcher
- * @library /../../test/lib/share/classes
+ * @library /test/lib/share/classes
  * @library /lib/testlibrary
  * @build jdk.testlibrary.*
  * @build jdk.test.lib.apps.*
--- a/test/sun/tools/jmap/BasicJMapTest.java	Fri Nov 13 12:00:23 2015 -0500
+++ b/test/sun/tools/jmap/BasicJMapTest.java	Fri Nov 13 10:35:27 2015 -0800
@@ -38,7 +38,7 @@
  * @summary Unit test for jmap utility
  * @key intermittent
  * @library /lib/testlibrary
- * @library /../../test/lib/share/classes
+ * @library /test/lib/share/classes
  * @modules java.management
  * @build jdk.testlibrary.*
  * @build jdk.test.lib.hprof.*
--- a/test/sun/tools/jmap/heapconfig/JMapHeapConfigTest.java	Fri Nov 13 12:00:23 2015 -0500
+++ b/test/sun/tools/jmap/heapconfig/JMapHeapConfigTest.java	Fri Nov 13 10:35:27 2015 -0800
@@ -36,7 +36,7 @@
  * @test
  * @bug 8042397
  * @summary Unit test for jmap utility test heap configuration reader
- * @library /../../test/lib/share/classes
+ * @library /test/lib/share/classes
  * @library /lib/testlibrary
  * @modules java.management
  * @build jdk.testlibrary.*
--- a/test/sun/tools/jstack/DeadlockDetectionTest.java	Fri Nov 13 12:00:23 2015 -0500
+++ b/test/sun/tools/jstack/DeadlockDetectionTest.java	Fri Nov 13 10:35:27 2015 -0800
@@ -37,7 +37,7 @@
 /*
  * @test
  * @summary Test deadlock detection
- * @library /../../test/lib/share/classes
+ * @library /test/lib/share/classes
  * @library /lib/testlibrary
  * @modules java.management
  * @build jdk.testlibrary.*