infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-04-13 16:38:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Joseph Provino 2015-11-11 23:45:51 +00:00
commit f2134af77c
10 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/InvokableTypeImpl.java
View File

@ -236,6 +236,15 @@ abstract class InvokableTypeImpl extends ReferenceTypeImpl {
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) {

7
jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/VirtualMachineImpl.java
View File

@ -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 @@ class VirtualMachineImpl extends MirrorImpl
}
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;
}
}

8
jdk/test/TEST.ROOT
View File

@ -26,5 +26,9 @@ groups=TEST.groups [closed/TEST.groups]
# 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 = ../../

2
jdk/test/com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.java
View File

@ -38,7 +38,7 @@ import com.sun.management.HotSpotDiagnosticMXBean;
* @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.*

2
jdk/test/java/util/Arrays/TimSortStackSize2.java
View File

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

2
jdk/test/sun/jvmstat/monitor/MonitoredVm/TestPollingInterval.java
View File

@ -42,7 +42,7 @@ import sun.jvmstat.monitor.VmIdentifier;
* @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

2
jdk/test/sun/tools/jhsdb/BasicLauncherTest.java
View File

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

2
jdk/test/sun/tools/jmap/BasicJMapTest.java
View File

@ -38,7 +38,7 @@ import jdk.testlibrary.ProcessTools;
* @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.*

2
jdk/test/sun/tools/jmap/heapconfig/JMapHeapConfigTest.java
View File

@ -36,7 +36,7 @@ import jdk.testlibrary.Platform;
* @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.*

2
jdk/test/sun/tools/jstack/DeadlockDetectionTest.java
View File

@ -37,7 +37,7 @@ import jdk.testlibrary.ProcessTools;
/*
* @test
* @summary Test deadlock detection
* @library /../../test/lib/share/classes
* @library /test/lib/share/classes
* @library /lib/testlibrary
* @modules java.management
* @build jdk.testlibrary.*