From 2ae66a0f292cab0cbebe6b8f891dad2e53693731 Mon Sep 17 00:00:00 2001 From: Yumin Qi Date: Wed, 26 Nov 2014 15:33:43 -0800 Subject: [PATCH 01/20] 8038468: java/lang/instrument/ParallelTransformerLoader.sh fails with ClassCircularityError Add check null for loader in transform to avoid when loading a class in callback handler for boot loader, CFLH set early enough to catch classes needed during class loading, i.e. sun.misc.URLClassPath$JarLoader$2 seen in the failure. Reviewed-by: acorn, sspitsyn --- .../ParallelTransformerLoaderAgent.java | 25 ++++++------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/jdk/test/java/lang/instrument/ParallelTransformerLoaderAgent.java b/jdk/test/java/lang/instrument/ParallelTransformerLoaderAgent.java index 96f4900b6d7..26a5801a908 100644 --- a/jdk/test/java/lang/instrument/ParallelTransformerLoaderAgent.java +++ b/jdk/test/java/lang/instrument/ParallelTransformerLoaderAgent.java @@ -79,24 +79,15 @@ public class ParallelTransformerLoaderAgent throws IllegalClassFormatException { String tName = Thread.currentThread().getName(); - // In 160_03 and older, transform() is called - // with the "system_loader_lock" held and that - // prevents the bootstrap class loaded from - // running in parallel. If we add a slight sleep - // delay here when the transform() call is not - // main or TestThread, then the deadlock in - // 160_03 and older is much more reproducible. - if (!tName.equals("main") && !tName.equals("TestThread")) { - System.out.println("Thread '" + tName + - "' has called transform()"); - try { - Thread.sleep(500); - } catch (InterruptedException ie) { - } - } - // load additional classes when called from other threads - if (!tName.equals("main")) + // Load additional classes when called from thread 'TestThread' + // When a class is loaded during a callback handling the boot loader, we can + // run into ClassCircularityError if the ClassFileLoadHook is set early enough + // to catch classes needed during class loading, e.g. + // sun.misc.URLClassPath$JarLoader$2. + // The goal of the test is to stress class loading on the test class loaders. + + if (tName.equals("TestThread") && loader != null) { loadClasses(3); } From f12ce83a250bd80a93f66a4b1e63378b85a7bf9d Mon Sep 17 00:00:00 2001 From: Erik Gahlin Date: Fri, 28 Nov 2014 16:56:45 +0100 Subject: [PATCH 02/20] 6618335: ThreadReference.stop(null) throws NPE instead of InvalidTypeException Reviewed-by: sla --- .../share/classes/com/sun/tools/jdi/ThreadReferenceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ThreadReferenceImpl.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ThreadReferenceImpl.java index 903477118a9..34abb5f5137 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ThreadReferenceImpl.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ThreadReferenceImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2014, 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 @@ -238,7 +238,7 @@ public class ThreadReferenceImpl extends ObjectReferenceImpl } public void stop(ObjectReference throwable) throws InvalidTypeException { - validateMirror(throwable); + validateMirrorOrNull(throwable); // Verify that the given object is a Throwable instance List list = vm.classesByName("java.lang.Throwable"); ClassTypeImpl throwableClass = (ClassTypeImpl)list.get(0); From e325ce88cbf869875377e19780ee28f59a6e321b Mon Sep 17 00:00:00 2001 From: Katja Kantserova Date: Mon, 1 Dec 2014 09:49:44 +0100 Subject: [PATCH 03/20] 8066106: sun/tools/jps/TestJpsClass.java failed to remove stale attach pid file Reviewed-by: jbachorik --- .../lib/testlibrary/OutputAnalyzerTest.java | 15 +++++++ .../jdk/testlibrary/OutputAnalyzer.java | 43 ++++++++++++++++--- jdk/test/sun/tools/jps/JpsHelper.java | 10 ++--- 3 files changed, 57 insertions(+), 11 deletions(-) diff --git a/jdk/test/lib/testlibrary/OutputAnalyzerTest.java b/jdk/test/lib/testlibrary/OutputAnalyzerTest.java index af2b8f6b14a..cb251b37964 100644 --- a/jdk/test/lib/testlibrary/OutputAnalyzerTest.java +++ b/jdk/test/lib/testlibrary/OutputAnalyzerTest.java @@ -112,8 +112,10 @@ public class OutputAnalyzerTest { } String stdoutPattern = "[a]"; + String stdoutByLinePattern = "a*"; String stderrPattern = "[b]"; String nonExistingPattern = "[c]"; + String byLinePattern = "[ab]*"; // Should match try { @@ -148,6 +150,19 @@ public class OutputAnalyzerTest { // expected } + if (output.shouldMatchByLine(byLinePattern) != 1) { + throw new Exception("shouldMatchByLine() should find one line"); + } + try { + output.shouldMatchByLine(nonExistingPattern); + throw new Exception("shouldMatchByLine() failed to throw exception"); + } catch (RuntimeException e) { + // expected + } + if (output.stdoutShouldMatchByLine(stdoutByLinePattern) != 1) { + throw new Exception("stdoutShouldMatchByLine() should find one line"); + } + // Should not match try { output.shouldNotMatch(nonExistingPattern); diff --git a/jdk/test/lib/testlibrary/jdk/testlibrary/OutputAnalyzer.java b/jdk/test/lib/testlibrary/jdk/testlibrary/OutputAnalyzer.java index ad1d2ab8ea3..88819e4d594 100644 --- a/jdk/test/lib/testlibrary/jdk/testlibrary/OutputAnalyzer.java +++ b/jdk/test/lib/testlibrary/jdk/testlibrary/OutputAnalyzer.java @@ -25,13 +25,9 @@ package jdk.testlibrary; import static jdk.testlibrary.Asserts.*; -import java.io.ByteArrayOutputStream; - import java.io.IOException; import java.util.ArrayList; import java.util.List; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.Future; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -414,8 +410,12 @@ public final class OutputAnalyzer { * @return Contents of the output buffer as list of strings */ public List asLines() { + return asLines(getOutput()); + } + + private List asLines(String buffer) { List l = new ArrayList<>(); - String[] a = getOutput().split(Utils.NEW_LINE); + String[] a = buffer.split(Utils.NEW_LINE); for (String string : a) { l.add(string); } @@ -444,6 +444,13 @@ public final class OutputAnalyzer { return shouldMatchByLine(null, null, pattern); } + /** + * @see #stdoutShouldMatchByLine(String, String, String) + */ + public int stdoutShouldMatchByLine(String pattern) { + return stdoutShouldMatchByLine(null, null, pattern); + } + /** * @see #shouldMatchByLine(String, String, String) */ @@ -474,7 +481,30 @@ public final class OutputAnalyzer { * @return Count of lines which match the {@code pattern} */ public int shouldMatchByLine(String from, String to, String pattern) { - List lines = asLines(); + return shouldMatchByLine(getOutput(), from, to, pattern); + } + + /** + * Verify that the stdout contents of output buffer matches the + * {@code pattern} line by line. The whole stdout could be matched or + * just a subset of it. + * + * @param from + * The line from where stdout will be matched. + * Set {@code from} to null for matching from the first line. + * @param to + * The line until where stdout will be matched. + * Set {@code to} to null for matching until the last line. + * @param pattern + * Matching pattern + * @return Count of lines which match the {@code pattern} + */ + public int stdoutShouldMatchByLine(String from, String to, String pattern) { + return shouldMatchByLine(getStdout(), from, to, pattern); + } + + private int shouldMatchByLine(String buffer, String from, String to, String pattern) { + List lines = asLines(buffer); int fromIndex = 0; if (from != null) { @@ -500,4 +530,5 @@ public final class OutputAnalyzer { return matchedCount; } + } diff --git a/jdk/test/sun/tools/jps/JpsHelper.java b/jdk/test/sun/tools/jps/JpsHelper.java index 4e00cc95de4..655b5eb465e 100644 --- a/jdk/test/sun/tools/jps/JpsHelper.java +++ b/jdk/test/sun/tools/jps/JpsHelper.java @@ -168,10 +168,8 @@ public final class JpsHelper { } /** - * Verify jps output contains pids and programs' name information. - * The function will discard any lines that come before the first line with pid. - * This can happen if the JVM outputs a warning message for some reason - * before running jps. + * Verify jps stdout contains only pids and programs' name information. + * jps stderr may contain VM warning messages which will be ignored. * * The output can look like: * 35536 Jps @@ -180,8 +178,10 @@ public final class JpsHelper { */ public static void verifyJpsOutput(OutputAnalyzer output, String regex) throws Exception { output.shouldHaveExitValue(0); - int matchedCount = output.shouldMatchByLineFrom(regex, regex); + int matchedCount = output.stdoutShouldMatchByLine(regex); assertGreaterThan(matchedCount , 0, "Found no lines matching pattern: " + regex); + output.stderrShouldNotMatch("[E|e]xception"); + output.stderrShouldNotMatch("[E|e]rror"); } /** From 07b4a3626e78958abb954bd57731d15bd0e9c413 Mon Sep 17 00:00:00 2001 From: Yuri Gaevsky Date: Tue, 2 Dec 2014 16:21:33 +0100 Subject: [PATCH 04/20] 6364329: jstat displays "invalid argument count" with usage Reviewed-by: jbachorik --- .../classes/sun/tools/jstat/Arguments.java | 7 ++++--- jdk/test/sun/tools/jstat/jstatHelp.sh | 20 ++++++++++++++----- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/Arguments.java b/jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/Arguments.java index 523bc504de7..a2e9813274c 100644 --- a/jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/Arguments.java +++ b/jdk/src/jdk.jcmd/share/classes/sun/tools/jstat/Arguments.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2014, 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 @@ -141,8 +141,9 @@ public class Arguments { public Arguments(String[] args) throws IllegalArgumentException { int argc = 0; - if (args.length < 1) { - throw new IllegalArgumentException("invalid argument count"); + if (args.length == 0) { + help = true; + return; } if ((args[0].compareTo("-?") == 0) diff --git a/jdk/test/sun/tools/jstat/jstatHelp.sh b/jdk/test/sun/tools/jstat/jstatHelp.sh index 3dac1ae407f..37c094f4cf3 100644 --- a/jdk/test/sun/tools/jstat/jstatHelp.sh +++ b/jdk/test/sun/tools/jstat/jstatHelp.sh @@ -1,5 +1,5 @@ # -# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2004, 2014, 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 @@ -22,9 +22,9 @@ # # @test -# @bug 4990825 +# @bug 4990825 6364329 # @run shell jstatHelp.sh -# @summary Test that output of 'jstat -?' matches the usage.out file +# @summary Test that output of 'jstat -?', 'jstat -help' and 'jstat' matches the usage.out file . ${TESTSRC-.}/../../jvmstat/testlibrary/utils.sh @@ -38,7 +38,7 @@ ${JSTAT} -J-XX:+UsePerfData -? > jstat.out 2>&1 diff -w jstat.out ${TESTSRC}/usage.out if [ $? != 0 ] then - echo "Output of jstat -? differ from expected output. Failed." + echo "Output of jstat -? differs from expected output. Failed." exit 1 fi @@ -48,7 +48,17 @@ ${JSTAT} -J-XX:+UsePerfData -help > jstat.out 2>&1 diff -w jstat.out ${TESTSRC}/usage.out if [ $? != 0 ] then - echo "Output of jstat -help differ from expected output. Failed." + echo "Output of jstat -help differs from expected output. Failed." + exit 1 +fi + +rm -f jstat.out 2>/dev/null +${JSTAT} -J-XX:+UsePerfData > jstat.out 2>&1 + +diff -w jstat.out ${TESTSRC}/usage.out +if [ $? != 0 ] +then + echo "Output of jstat differs from expected output. Failed." exit 1 fi From a5ed93db7ce0828552f2ef967f873019b520e0e4 Mon Sep 17 00:00:00 2001 From: Katja Kantserova Date: Wed, 3 Dec 2014 11:56:02 +0100 Subject: [PATCH 05/20] 8044591: [TESTBUG] com/sun/management/GarbageCollectorMXBean/GarbageCollectionNotificationp[Content]Test.java fail when -XX:+ExplicitGCInvokesConcurrent Reviewed-by: sla, fparain --- jdk/test/ProblemList.txt | 4 ---- .../GarbageCollectionNotificationContentTest.java | 1 + .../GarbageCollectionNotificationTest.java | 1 + 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/jdk/test/ProblemList.txt b/jdk/test/ProblemList.txt index fb0af4e7087..a8d13e5e7f5 100644 --- a/jdk/test/ProblemList.txt +++ b/jdk/test/ProblemList.txt @@ -135,10 +135,6 @@ java/lang/instrument/RetransformBigClass.sh generic-all # jdk_management -# 8044591 -com/sun/management/GarbageCollectorMXBean/GarbageCollectionNotificationContentTest.java generic-all -com/sun/management/GarbageCollectorMXBean/GarbageCollectionNotificationTest.java generic-all - # 8058492 java/lang/management/ThreadMXBean/FindDeadlocks.java generic-all diff --git a/jdk/test/com/sun/management/GarbageCollectorMXBean/GarbageCollectionNotificationContentTest.java b/jdk/test/com/sun/management/GarbageCollectorMXBean/GarbageCollectionNotificationContentTest.java index 6d3386b0905..e823f3108b8 100644 --- a/jdk/test/com/sun/management/GarbageCollectorMXBean/GarbageCollectionNotificationContentTest.java +++ b/jdk/test/com/sun/management/GarbageCollectorMXBean/GarbageCollectionNotificationContentTest.java @@ -26,6 +26,7 @@ * @bug 7036199 * @summary Check that GarbageCollectionNotification contents are reasonable * @author Frederic Parain + * @requires vm.opt.ExplicitGCInvokesConcurrent == null | vm.opt.ExplicitGCInvokesConcurrent == false * @run main/othervm GarbageCollectionNotificationContentTest */ diff --git a/jdk/test/com/sun/management/GarbageCollectorMXBean/GarbageCollectionNotificationTest.java b/jdk/test/com/sun/management/GarbageCollectorMXBean/GarbageCollectionNotificationTest.java index bad4e4076b0..da8082ed2ad 100644 --- a/jdk/test/com/sun/management/GarbageCollectorMXBean/GarbageCollectionNotificationTest.java +++ b/jdk/test/com/sun/management/GarbageCollectorMXBean/GarbageCollectionNotificationTest.java @@ -26,6 +26,7 @@ * @bug 7036199 * @summary Check that GarbageCollection notification are thrown by every GarbageCollectorMXBean * @author Frederic Parain + * @requires vm.opt.ExplicitGCInvokesConcurrent == null | vm.opt.ExplicitGCInvokesConcurrent == false * @run main/othervm GarbageCollectionNotificationTest */ From 8fd2fa2d03944ba3c6890ca409ce75da74622928 Mon Sep 17 00:00:00 2001 From: Jaroslav Bachorik Date: Wed, 3 Dec 2014 16:44:35 +0100 Subject: [PATCH 06/20] 8064441: java/lang/management/ThreadMXBean/Locks.java fails intermittently, blocked on wrong object Reviewed-by: dholmes, egahlin, sspitsyn --- .../lang/management/ThreadMXBean/Locks.java | 69 ++++++++++++------- 1 file changed, 43 insertions(+), 26 deletions(-) diff --git a/jdk/test/java/lang/management/ThreadMXBean/Locks.java b/jdk/test/java/lang/management/ThreadMXBean/Locks.java index 14273b5fdc5..1c8da469289 100644 --- a/jdk/test/java/lang/management/ThreadMXBean/Locks.java +++ b/jdk/test/java/lang/management/ThreadMXBean/Locks.java @@ -29,17 +29,21 @@ * @author Mandy Chung * @author Jaroslav Bachorik * + * @library /lib/testlibrary + * @build jdk.testlibrary.* * @run main/othervm Locks */ import java.lang.management.*; import java.util.concurrent.Phaser; +import jdk.testlibrary.LockFreeLogManager; public class Locks { private static final Object objA = new Object(); private static final Object objB = new Object(); private static final Object objC = new Object(); private static final ThreadMXBean tm = ManagementFactory.getThreadMXBean(); + private static final LockFreeLogManager logger = new LockFreeLogManager(); private static boolean testFailed = false; @@ -126,14 +130,14 @@ public class Locks { public void run() { synchronized(objA) { // stop here for LockBThread to hold objB - System.out.println("LockAThread about to block on objB"); + log("LockAThread about to block on objB"); p.arriveAndAwaitAdvance(); // Phase 1 (blocking) synchronized(objB) { dummyCounter++; }; } p.arriveAndAwaitAdvance(); // Phase 2 (blocking) - System.out.println("LockAThread about to exit"); + log("LockAThread about to exit"); // Make sure the current thread is not holding any lock assertNoLock(this); } @@ -147,7 +151,7 @@ public class Locks { } public void run() { synchronized(objB) { - System.out.println("LockBThread about to block on objC"); + log("LockBThread about to block on objC"); p.arriveAndAwaitAdvance(); // Phase 1 (blocking) // Signal main thread about to block on objC synchronized(objC) { @@ -155,14 +159,14 @@ public class Locks { }; } p.arriveAndAwaitAdvance(); // Phase 2 (blocking) - System.out.println("LockBThread about to exit"); + log("LockBThread about to exit"); // Make sure the current thread is not holding any lock assertNoLock(this); } } private static WaitingThread waiter; - private static Object ready = new Object(); + private static final Object ready = new Object(); private static CheckerThread checker; static class WaitingThread extends Thread { private final Phaser p; @@ -173,9 +177,10 @@ public class Locks { super("WaitingThread"); this.p = p; } + @Override public void run() { synchronized(objC) { - System.out.println("WaitingThread about to wait on objC"); + log("WaitingThread about to wait on objC"); try { // Signal checker thread, about to wait on objC. waiting = false; @@ -188,13 +193,13 @@ public class Locks { } // block until CheckerThread finishes checking - System.out.println("WaitingThread about to block on ready"); + log("WaitingThread about to block on ready"); // signal checker thread that it is about acquire // object ready. p.arriveAndAwaitAdvance(); // Phase 2 (waiting) synchronized(ready) { dummyCounter++; - }; + } } synchronized(objC) { try { @@ -208,7 +213,7 @@ public class Locks { testFailed = true; } } - System.out.println("WaitingThread about to exit waiting on objC 2"); + log("WaitingThread about to exit waiting on objC 2"); } public void waitForWaiting() { @@ -321,10 +326,10 @@ public class Locks { private static ThreadInfo findOwnerInfo(ThreadInfo[] infos, String lock) throws Exception { ThreadInfo ownerInfo = null; - for (int i = 0; i < infos.length; i++) { - String blockedLock = infos[i].getLockName(); + for (ThreadInfo info : infos) { + String blockedLock = info.getLockName(); if (lock.equals(blockedLock)) { - long threadId = infos[i].getLockOwnerId(); + long threadId = info.getLockOwnerId(); if (threadId == -1) { throw new RuntimeException("TEST FAILED: " + lock + " expected to have owner"); @@ -355,14 +360,17 @@ public class Locks { throws Exception { ThreadInfo ownerInfo = null; // Find the thread who is blocking on lock - for (int i = 0; i < infos.length; i++) { - String blockedLock = infos[i].getLockName(); + for (ThreadInfo info : infos) { + String blockedLock = info.getLockName(); if (lock.equals(blockedLock)) { - System.out.print(infos[i].getThreadName() + - " blocked on " + blockedLock); - ownerInfo = infos[i]; + log("%s blocked on %s", info.getThreadName(), blockedLock); + ownerInfo = info; } } + if (ownerInfo == null) { + throw new RuntimeException("TEST FAILED: " + + "Can't retrieve ThreadInfo for the blocked thread"); + } long[] threads = new long[10]; int count = 0; @@ -370,14 +378,18 @@ public class Locks { while (ownerInfo != null && ownerInfo.getThreadState() == Thread.State.BLOCKED) { ownerInfo = findOwnerInfo(infos, lock); threads[count++] = ownerInfo.getThreadId(); - System.out.println(" Owner = " + ownerInfo.getThreadName() + - " id = " + ownerInfo.getThreadId()); + log(" Owner = %s id = %d", + ownerInfo.getThreadName(), + ownerInfo.getThreadId() + ); lock = ownerInfo.getLockName(); - System.out.print(ownerInfo.getThreadName() + " Id = " + - ownerInfo.getThreadId() + - " blocked on " + lock); + log("%s Id = %d blocked on %s", + ownerInfo.getThreadName(), + ownerInfo.getThreadId(), + lock + ); } - System.out.println(); + log(""); if (count != expectedThreads.length) { throw new RuntimeException("TEST FAILED: " + @@ -385,10 +397,15 @@ public class Locks { } for (int i = 0; i < count; i++) { if (threads[i] != expectedThreads[i]) { - System.out.println("TEST FAILED: " + - "Unexpected thread in the chain " + threads[i] + - " expected to be " + expectedThreads[i]); + log("TEST FAILED: Unexpected thread in the chain %s expected to be %s", + threads[i], + expectedThreads[i] + ); } } } + + private static void log(String format, Object ... args) { + logger.log(format + "%n", args); + } } From a47e1013c2f725fcf33bb1316ef70f9f2e7199a3 Mon Sep 17 00:00:00 2001 From: Chris Plummer Date: Thu, 4 Dec 2014 11:26:46 -0800 Subject: [PATCH 07/20] 6762191: Setting stack size to 16K causes segmentation fault Fixed by forcing the stack size to always be at least 32k. Reviewed-by: dholmes, alanb, ksrini, sspitsyn --- jdk/src/java.base/share/native/libjli/java.c | 15 ++ .../tools/launcher/TooSmallStackSize.java | 158 ++++++++++++++++++ 2 files changed, 173 insertions(+) create mode 100644 jdk/test/tools/launcher/TooSmallStackSize.java diff --git a/jdk/src/java.base/share/native/libjli/java.c b/jdk/src/java.base/share/native/libjli/java.c index c71f4c26fab..03f493e53c2 100644 --- a/jdk/src/java.base/share/native/libjli/java.c +++ b/jdk/src/java.base/share/native/libjli/java.c @@ -168,6 +168,13 @@ static jlong threadStackSize = 0; /* stack size of the new thread */ static jlong maxHeapSize = 0; /* max heap size */ static jlong initialHeapSize = 0; /* inital heap size */ +/* + * A minimum -Xss stack size suitable for all platforms. + */ +#ifndef STACK_SIZE_MINIMUM +#define STACK_SIZE_MINIMUM (32 * KB) +#endif + /* * Entry point. */ @@ -773,6 +780,14 @@ AddOption(char *str, void *info) jlong tmp; if (parse_size(str + 4, &tmp)) { threadStackSize = tmp; + /* + * Make sure the thread stack size is big enough that we won't get a stack + * overflow before the JVM startup code can check to make sure the stack + * is big enough. + */ + if (threadStackSize < STACK_SIZE_MINIMUM) { + threadStackSize = STACK_SIZE_MINIMUM; + } } } diff --git a/jdk/test/tools/launcher/TooSmallStackSize.java b/jdk/test/tools/launcher/TooSmallStackSize.java new file mode 100644 index 00000000000..dac1c7f0325 --- /dev/null +++ b/jdk/test/tools/launcher/TooSmallStackSize.java @@ -0,0 +1,158 @@ +/* + * Copyright (c) 2014, 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 6762191 + * @summary Setting stack size to 16K causes segmentation fault + * @compile TooSmallStackSize.java + * @run main TooSmallStackSize + */ + +/* + * The primary purpose of this test is to make sure we can run with a 16k stack + * size without crashing. Also this test will determine the minimum allowed + * stack size for the platform (as provided by the JVM error message when a very + * small stack is used), and then verify that the JVM can be launched with that stack + * size without a crash or any error messages. + */ + +public class TooSmallStackSize extends TestHelper { + /* for debugging. Normally false. */ + static final boolean verbose = false; + + static void printTestOutput(TestResult tr) { + System.out.println("*** exitValue = " + tr.exitValue); + for (String x : tr.testOutput) { + System.out.println(x); + } + } + + /* + * Returns the minimum stack size this platform will allowed based on the + * contents of the error message the JVM outputs when too small of a + * -Xss size was used. + * + * The TestResult argument must contain the result of having already run + * the JVM with too small of a stack size. + */ + static String getMinStackAllowed(TestResult tr) { + /* + * The JVM output will contain in one of the lines: + * "The stack size specified is too small, Specify at least 100k" + * Although the actual size will vary. We need to extract this size + * string from the output and return it. + */ + String matchStr = "Specify at least "; + for (String x : tr.testOutput) { + int match_idx = x.indexOf(matchStr); + if (match_idx >= 0) { + int size_start_idx = match_idx + matchStr.length(); + int k_start_idx = x.indexOf("k", size_start_idx); + return x.substring(size_start_idx, k_start_idx + 1); // include the "k" + } + } + + System.out.println("FAILED: Could not get the stack size from the output"); + throw new RuntimeException("test fails"); + } + + /* + * Run the JVM with the specified stack size. + * + * Returns the minimum allowed stack size gleaned from the error message, + * if there is an error message. Otherwise returns the stack size passed in. + */ + static String checkStack(String stackSize) { + String min_stack_allowed; + TestResult tr; + + if (verbose) + System.out.println("*** Testing " + stackSize); + tr = doExec(javaCmd, "-Xss" + stackSize, "-version"); + if (verbose) + printTestOutput(tr); + + if (tr.isOK()) { + System.out.println("PASSED: got no error message with stack size of " + stackSize); + min_stack_allowed = stackSize; + } else { + if (tr.contains("The stack size specified is too small")) { + System.out.println("PASSED: got expected error message with stack size of " + stackSize); + min_stack_allowed = getMinStackAllowed(tr); + } else { + // Likely a crash + System.out.println("FAILED: Did not get expected error message with stack size of " + stackSize); + throw new RuntimeException("test fails"); + } + } + + return min_stack_allowed; + } + + /* + * Run the JVM with the minimum allowed stack size. This should always succeed. + */ + static void checkMinStackAllowed(String stackSize) { + TestResult tr = null; + + if (verbose) + System.out.println("*** Testing " + stackSize); + tr = doExec(javaCmd, "-Xss" + stackSize, "-version"); + if (verbose) + printTestOutput(tr); + + if (tr.isOK()) { + System.out.println("PASSED: VM launched with minimum allowed stack size of " + stackSize); + } else { + // Likely a crash + System.out.println("FAILED: VM failed to launch with minimum allowed stack size of " + stackSize); + throw new RuntimeException("test fails"); + } + } + + public static void main(String... args) { + /* + * The result of a 16k stack size should be a quick exit with a complaint + * that the stack size is too small. However, for some win32 builds, the + * stack is always at least 64k, and this also sometimes is the minimum + * allowed size, so we won't see an error in this case. + * + * This test case will also produce a crash on some platforms if the fix + * for 6762191 is not yet in place. + */ + checkStack("16k"); + + /* + * Try with a 32k stack size, which is the size that the launcher will + * set to if you try setting to anything smaller. This should produce the same + * result as setting to 16k if the fix for 6762191 is in place. + */ + String min_stack_allowed = checkStack("32k"); + + /* + * Try again with a the minimum stack size that was given in the error message + */ + checkMinStackAllowed(min_stack_allowed); + } +} From 594e368671a0a863d7e3d2b663b4e1efb6ab8dc8 Mon Sep 17 00:00:00 2001 From: Jaroslav Bachorik Date: Tue, 9 Dec 2014 08:58:19 +0100 Subject: [PATCH 08/20] 8059949: com/sun/tools/attach/StartManagementAgent.java interrupted! (timed out?) Reviewed-by: sla --- jdk/test/com/sun/tools/attach/StartManagementAgent.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jdk/test/com/sun/tools/attach/StartManagementAgent.java b/jdk/test/com/sun/tools/attach/StartManagementAgent.java index b2ee68d01b0..9d367c04186 100644 --- a/jdk/test/com/sun/tools/attach/StartManagementAgent.java +++ b/jdk/test/com/sun/tools/attach/StartManagementAgent.java @@ -41,7 +41,7 @@ import jdk.testlibrary.Utils; * @summary Test for VirtualMachine.startManagementAgent and VirtualMachine.startLocalManagementAgent * @library /lib/testlibrary * @run build Application SimpleProvider jdk.testlibrary.* - * @run main StartManagementAgent + * @run main/timeout=300 StartManagementAgent */ /* From 7ffa3cd6690bae9b16b5dd49117290207a6a77f1 Mon Sep 17 00:00:00 2001 From: Amanda Jiang Date: Fri, 12 Dec 2014 00:19:17 +0000 Subject: [PATCH 09/20] 8048819: Implement reliability test for DH algorithm Added DH test for up-to-4 parties key exchange Reviewed-by: valeriep --- .../KeyAgreement/SameDHKeyStressTest.java | 169 ++++++++++++++++++ 1 file changed, 169 insertions(+) create mode 100644 jdk/test/com/sun/crypto/provider/KeyAgreement/SameDHKeyStressTest.java diff --git a/jdk/test/com/sun/crypto/provider/KeyAgreement/SameDHKeyStressTest.java b/jdk/test/com/sun/crypto/provider/KeyAgreement/SameDHKeyStressTest.java new file mode 100644 index 00000000000..f0067da5439 --- /dev/null +++ b/jdk/test/com/sun/crypto/provider/KeyAgreement/SameDHKeyStressTest.java @@ -0,0 +1,169 @@ +/* + * Copyright (c) 1999, 2014, 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 8048819 + * @summary This test stressful verifies the assertion of "The secret keys generated + * by all involved parties should be the same." for javax.crypto.KeyAgreement + * @run main SameDHKeyStressTest + */ +import java.security.AlgorithmParameterGenerator; +import java.security.InvalidAlgorithmParameterException; +import java.security.InvalidKeyException; +import java.security.Key; +import java.security.KeyPair; +import java.security.KeyPairGenerator; +import java.security.NoSuchAlgorithmException; +import java.security.NoSuchProviderException; +import java.security.spec.AlgorithmParameterSpec; +import java.util.Arrays; +import javax.crypto.KeyAgreement; +import javax.crypto.SecretKey; +import javax.crypto.spec.DHGenParameterSpec; +import javax.crypto.spec.DHParameterSpec; + +public class SameDHKeyStressTest { + + static final String[] ALGORITHMS = {"DH", "DiffieHellman", "dh", "diffieHELLMAN"}; + static final String[] SECRET_ALOGRITHMS = {"DES", "DESede", "blowfish"}; + static final int[] NUMBER_OF_PARTIES = {2, 3, 4}; + static final String[] PA_NAMES = {"Alice", "Bob", "Carol", "David"}; + + public static void main(String args[]) { + int failedCnt = 0; + StringBuilder failedList = new StringBuilder("Failed List:"); + + for (String algorithm : ALGORITHMS) { + for (int numOfParties : NUMBER_OF_PARTIES) { + for (String secretAlgorithm : SECRET_ALOGRITHMS) { + if (!runTest(algorithm, numOfParties, secretAlgorithm)) { + failedCnt++; + failedList.append("\n Altorightm = ").append(algorithm). + append(" Number of Parties = ").append(numOfParties). + append(" Secret Algorithm = ").append(secretAlgorithm); + } + } + } + } //end of for loop + + if (failedCnt > 0) { + System.out.println(failedList); + throw new RuntimeException("SameDHKeyStressTest Failed"); + } + } + + public static boolean runTest(String algo, int numParties, String secretAlgo) { + KAParticipant[] parties = new KAParticipant[numParties]; + Key[] keyArchives = new Key[numParties]; + try { + // generate AlogirhtmParameterSpec + AlgorithmParameterGenerator apg = AlgorithmParameterGenerator.getInstance("DH","SunJCE"); + AlgorithmParameterSpec aps = new DHGenParameterSpec(512, 64); + apg.init(aps); + DHParameterSpec spec = apg.generateParameters(). + getParameterSpec(DHParameterSpec.class); + + //initilize all KeyAgreement participants + for (int i = 0; i < numParties; i++) { + parties[i] = new KAParticipant(PA_NAMES[i], algo); + parties[i].initialize(spec); + keyArchives[i] = parties[i].getPublicKey(); + } + + // Do all phases in the KeyAgreement for all participants + Key[] keyBuffer = new Key[numParties]; + boolean lastPhase = false; + for (int j = 0; j < numParties - 1; j++) { + if (j == numParties - 2) { + lastPhase = true; + } + for (int k = 0; k < numParties; k++) { + if (k == numParties - 1) { + keyBuffer[k] = parties[k].doPhase(keyArchives[0], lastPhase); + } else { + keyBuffer[k] = parties[k].doPhase(keyArchives[k + 1], lastPhase); + } + } + System.arraycopy(keyBuffer, 0, keyArchives, 0, numParties); + } + + //Comparison: The secret keys generated by all involved parties should be the same + SecretKey[] sKeys = new SecretKey[numParties]; + for (int n = 0; n < numParties; n++) { + sKeys[n] = parties[n].generateSecret(secretAlgo); + } + for (int q = 0; q < numParties - 1; q++) { + if (!Arrays.equals(sKeys[q].getEncoded(), sKeys[q + 1].getEncoded())) { + return false; + } + } + return true; + } catch (Exception ex) { + ex.printStackTrace(); + return false; + } + + } + +} + +class KAParticipant { + + private String name = null; + private String algorithm = null; + private KeyPairGenerator keyGen = null; + private KeyPair keys = null; + private KeyAgreement ka = null; + + public KAParticipant(String pName, String algo) throws NoSuchAlgorithmException, NoSuchProviderException { + name = pName; + algorithm = algo; + keyGen = KeyPairGenerator.getInstance(algo,"SunJCE"); + ka = KeyAgreement.getInstance(algo,"SunJCE"); + } + + public void initialize(AlgorithmParameterSpec spec) throws InvalidAlgorithmParameterException, InvalidKeyException { + keyGen.initialize(spec); + keys = keyGen.generateKeyPair(); + ka.init(keys.getPrivate()); + } + + public Key doPhase(Key key, boolean lastPhase) throws InvalidKeyException { + return ka.doPhase(key, lastPhase); + } + + public Key getPublicKey() { + return keys.getPublic(); + } + + public byte[] generateSecret() { + return ka.generateSecret(); + } + + public SecretKey generateSecret(String algo) throws java.lang.IllegalStateException, + java.security.NoSuchAlgorithmException, + java.security.InvalidKeyException { + return ka.generateSecret(algo); + } +} From 86291780cb0199ac4a33861cc5e25957d78b2ae3 Mon Sep 17 00:00:00 2001 From: Valerie Peng Date: Fri, 12 Dec 2014 00:23:32 +0000 Subject: [PATCH 10/20] 8062170: java.security.ProviderException: Error parsing configuration with space Updated to parse library path as a line which can contain quoted strings. Reviewed-by: vinnie --- .../classes/sun/security/pkcs11/Config.java | 18 ++++++++++++++---- .../pkcs11/Provider/ConfigShortPath.java | 6 +++--- .../sun/security/pkcs11/Provider/cspSpace.cfg | 5 +++++ 3 files changed, 22 insertions(+), 7 deletions(-) create mode 100644 jdk/test/sun/security/pkcs11/Provider/cspSpace.cfg diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/Config.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/Config.java index f4bcc589131..01d3b3752d6 100644 --- a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/Config.java +++ b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/Config.java @@ -584,16 +584,24 @@ final class Config { } private String parseLine() throws IOException { - String s = parseWord(); + // allow quoted string as part of line + String s = null; while (true) { int token = nextToken(); if ((token == TT_EOL) || (token == TT_EOF)) { break; } - if (token != TT_WORD) { + if (token != TT_WORD && token != '\"') { throw excToken("Unexpected value"); } - s = s + " " + st.sval; + if (s == null) { + s = st.sval; + } else { + s = s + " " + st.sval; + } + } + if (s == null) { + throw excToken("Unexpected empty line"); } return s; } @@ -653,7 +661,9 @@ final class Config { // private String parseLibrary(String keyword) throws IOException { - String lib = parseStringEntry(keyword); + checkDup(keyword); + parseEquals(); + String lib = parseLine(); lib = expand(lib); int i = lib.indexOf("/$ISA/"); if (i != -1) { diff --git a/jdk/test/sun/security/pkcs11/Provider/ConfigShortPath.java b/jdk/test/sun/security/pkcs11/Provider/ConfigShortPath.java index 030e420890c..a4d29e9a9f4 100644 --- a/jdk/test/sun/security/pkcs11/Provider/ConfigShortPath.java +++ b/jdk/test/sun/security/pkcs11/Provider/ConfigShortPath.java @@ -22,8 +22,8 @@ */ /** * @test - * @bug 6581254 6986789 7196009 - * @summary Allow '~', '+' and quoted paths in config file + * @bug 6581254 6986789 7196009 8062170 + * @summary Allow '~', '+', and quoted paths in config file * @author Valerie Peng */ @@ -34,7 +34,7 @@ import java.lang.reflect.*; public class ConfigShortPath { private static final String[] configNames = { - "csp.cfg", "cspPlus.cfg", "cspQuotedPath.cfg" + "csp.cfg", "cspPlus.cfg", "cspSpace.cfg", "cspQuotedPath.cfg" }; public static void main(String[] args) throws Exception { diff --git a/jdk/test/sun/security/pkcs11/Provider/cspSpace.cfg b/jdk/test/sun/security/pkcs11/Provider/cspSpace.cfg new file mode 100644 index 00000000000..da55f9dc5ba --- /dev/null +++ b/jdk/test/sun/security/pkcs11/Provider/cspSpace.cfg @@ -0,0 +1,5 @@ +showInfo = false +name = test +library = C:\pki DLL\x64\acpkcs211.dll + + From 41844a4b8ca287d48acca3c927fd10830888c8d4 Mon Sep 17 00:00:00 2001 From: Joe Darcy Date: Tue, 16 Dec 2014 11:05:12 -0800 Subject: [PATCH 11/20] 8067091: Fix Windows-specific deprecation warnings in the jdk.crypto.mscapi module Reviewed-by: vinnie --- .../windows/classes/sun/security/mscapi/RSACipher.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jdk/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/RSACipher.java b/jdk/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/RSACipher.java index 023725b6205..f6f91106c94 100644 --- a/jdk/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/RSACipher.java +++ b/jdk/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/RSACipher.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2014, 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 @@ -159,6 +159,7 @@ public final class RSACipher extends CipherSpi { } // see JCE spec + @SuppressWarnings("deprecation") protected void engineInit(int opmode, Key key, AlgorithmParameterSpec params, SecureRandom random) throws InvalidKeyException, InvalidAlgorithmParameterException { @@ -369,6 +370,7 @@ public final class RSACipher extends CipherSpi { } // see JCE spec + @SuppressWarnings("deprecation") protected java.security.Key engineUnwrap(byte[] wrappedKey, String algorithm, int type) throws InvalidKeyException, NoSuchAlgorithmException { From e9e0b591dc5947ae525eb73ad1e2d650bb215fd6 Mon Sep 17 00:00:00 2001 From: Joe Darcy Date: Tue, 16 Dec 2014 11:49:37 -0800 Subject: [PATCH 12/20] 8067088: Suppress solaris-specific deprecation warnings in the jdk.crypto.ucrypto module Reviewed-by: valeriep --- .../classes/com/oracle/security/ucrypto/NativeRSACipher.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeRSACipher.java b/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeRSACipher.java index 813da731c06..a9ff2f02f86 100644 --- a/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeRSACipher.java +++ b/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeRSACipher.java @@ -178,6 +178,7 @@ public class NativeRSACipher extends CipherSpi { // see JCE spec @Override + @SuppressWarnings("deprecation") protected synchronized void engineInit(int opmode, Key newKey, AlgorithmParameterSpec params, SecureRandom random) throws InvalidKeyException, InvalidAlgorithmParameterException { @@ -331,6 +332,7 @@ public class NativeRSACipher extends CipherSpi { // see JCE spec @Override + @SuppressWarnings("deprecation") protected synchronized Key engineUnwrap(byte[] wrappedKey, String wrappedKeyAlgorithm, int wrappedKeyType) throws InvalidKeyException, NoSuchAlgorithmException { From 9cb99ee08002da3505a62743e6abf3a8b6998f44 Mon Sep 17 00:00:00 2001 From: Naoto Sato Date: Tue, 16 Dec 2014 12:48:31 -0800 Subject: [PATCH 13/20] 8062588: Support java.util.spi.*, java.text.spi.*, java.awt.im.spi loaded from classpath Reviewed-by: alanb --- .../java/util/spi/LocaleServiceProvider.java | 5 ++-- .../provider/SPILocaleProviderAdapter.java | 3 ++- .../classes/java/awt/im/spi/package.html | 5 ++-- .../awt/im/ExecutableInputMethodManager.java | 3 ++- jdk/test/ProblemList.txt | 16 ----------- jdk/test/java/util/Locale/LocaleProviders.sh | 27 ++++++++++++++++--- .../BreakIteratorProviderTest.sh | 4 +-- .../CalendarDataProviderTest.sh | 4 +-- .../CalendarNameProviderTest.sh | 4 +-- .../util/PluggableLocale/ClasspathTest.java | 8 +++--- .../util/PluggableLocale/ClasspathTest.sh | 7 +++-- .../PluggableLocale/CollatorProviderTest.sh | 4 +-- .../CurrencyNameProviderTest.sh | 4 +-- .../PluggableLocale/DateFormatProviderTest.sh | 4 +-- .../DateFormatSymbolsProviderTest.sh | 4 +-- .../DecimalFormatSymbolsProviderTest.sh | 4 +-- .../java/util/PluggableLocale/ExecTest.sh | 15 +---------- .../java/util/PluggableLocale/GenericTest.sh | 4 +-- .../PluggableLocale/LocaleNameProviderTest.sh | 4 +-- .../NumberFormatProviderTest.sh | 4 +-- .../TimeZoneNameProviderTest.sh | 4 +-- .../util/ResourceBundle/Bug6299235Test.sh | 17 ++---------- 22 files changed, 65 insertions(+), 89 deletions(-) diff --git a/jdk/src/java.base/share/classes/java/util/spi/LocaleServiceProvider.java b/jdk/src/java.base/share/classes/java/util/spi/LocaleServiceProvider.java index 5e3b5080cf8..3b2cb534bad 100644 --- a/jdk/src/java.base/share/classes/java/util/spi/LocaleServiceProvider.java +++ b/jdk/src/java.base/share/classes/java/util/spi/LocaleServiceProvider.java @@ -43,9 +43,8 @@ import java.util.Locale; * supported by the Java runtime environment itself. * *

Packaging of Locale Sensitive Service Provider Implementations

- * Implementations of these locale sensitive services are packaged using the - * Java Extension Mechanism - * as installed extensions. A provider identifies itself with a + * Implementations of these locale sensitive services can be made available + * by adding them to the application's class path. A provider identifies itself with a * provider-configuration file in the resource directory META-INF/services, * using the fully qualified provider interface class name as the file name. * The file should contain a list of fully-qualified concrete provider class names, diff --git a/jdk/src/java.base/share/classes/sun/util/locale/provider/SPILocaleProviderAdapter.java b/jdk/src/java.base/share/classes/sun/util/locale/provider/SPILocaleProviderAdapter.java index 59de0e2a629..be87f042e77 100644 --- a/jdk/src/java.base/share/classes/sun/util/locale/provider/SPILocaleProviderAdapter.java +++ b/jdk/src/java.base/share/classes/sun/util/locale/provider/SPILocaleProviderAdapter.java @@ -77,7 +77,8 @@ public class SPILocaleProviderAdapter extends AuxLocaleProviderAdapter { public P run() { P delegate = null; - for (LocaleServiceProvider provider : ServiceLoader.loadInstalled(c)) { + for (LocaleServiceProvider provider : + ServiceLoader.load(c, ClassLoader.getSystemClassLoader())) { if (delegate == null) { try { delegate = diff --git a/jdk/src/java.desktop/share/classes/java/awt/im/spi/package.html b/jdk/src/java.desktop/share/classes/java/awt/im/spi/package.html index 11d28e6686d..2e63c9297cd 100644 --- a/jdk/src/java.desktop/share/classes/java/awt/im/spi/package.html +++ b/jdk/src/java.desktop/share/classes/java/awt/im/spi/package.html @@ -55,9 +55,8 @@ recognition.

Packaging Input Methods

-

Input methods are packaged as installed extensions, as specified -by the Extension -Mechanism. The main JAR file of an input method must contain the +

Input methods can be made available by adding them to the application's +class path. The main JAR file of an input method must contain the file:

    META-INF/services/java.awt.im.spi.InputMethodDescriptor
diff --git a/jdk/src/java.desktop/share/classes/sun/awt/im/ExecutableInputMethodManager.java b/jdk/src/java.desktop/share/classes/sun/awt/im/ExecutableInputMethodManager.java index d974cdec24a..11619ba453d 100644 --- a/jdk/src/java.desktop/share/classes/sun/awt/im/ExecutableInputMethodManager.java +++ b/jdk/src/java.desktop/share/classes/sun/awt/im/ExecutableInputMethodManager.java @@ -259,7 +259,8 @@ class ExecutableInputMethodManager extends InputMethodManager AccessController.doPrivileged(new PrivilegedExceptionAction() { public Object run() { for (InputMethodDescriptor descriptor : - ServiceLoader.loadInstalled(InputMethodDescriptor.class)) { + ServiceLoader.load(InputMethodDescriptor.class, + ClassLoader.getSystemClassLoader())) { ClassLoader cl = descriptor.getClass().getClassLoader(); javaInputMethodLocatorList.add(new InputMethodLocator(descriptor, cl, null)); } diff --git a/jdk/test/ProblemList.txt b/jdk/test/ProblemList.txt index b6a77f79fea..1f54f49b22d 100644 --- a/jdk/test/ProblemList.txt +++ b/jdk/test/ProblemList.txt @@ -306,22 +306,6 @@ com/sun/jdi/RedefinePop.sh generic-all # 8051641 sun/util/calendar/zi/TestZoneInfo310.java generic-all -# 8062588 -java/util/Locale/LocaleProviders.sh generic-all -java/util/PluggableLocale/BreakIteratorProviderTest.sh generic-all -java/util/PluggableLocale/CalendarDataProviderTest.sh generic-all -java/util/PluggableLocale/CalendarNameProviderTest.sh generic-all -java/util/PluggableLocale/CollatorProviderTest.sh generic-all -java/util/PluggableLocale/CurrencyNameProviderTest.sh generic-all -java/util/PluggableLocale/DateFormatProviderTest.sh generic-all -java/util/PluggableLocale/DateFormatSymbolsProviderTest.sh generic-all -java/util/PluggableLocale/DecimalFormatSymbolsProviderTest.sh generic-all -java/util/PluggableLocale/GenericTest.sh generic-all -java/util/PluggableLocale/LocaleNameProviderTest.sh generic-all -java/util/PluggableLocale/NumberFormatProviderTest.sh generic-all -java/util/PluggableLocale/TimeZoneNameProviderTest.sh generic-all -java/util/ResourceBundle/Bug6299235Test.sh generic-all - # 8062512 java/util/spi/ResourceBundleControlProvider/UserDefaultControlTest.java generic-all diff --git a/jdk/test/java/util/Locale/LocaleProviders.sh b/jdk/test/java/util/Locale/LocaleProviders.sh index df3a75f8082..5d0c074e9cf 100644 --- a/jdk/test/java/util/Locale/LocaleProviders.sh +++ b/jdk/test/java/util/Locale/LocaleProviders.sh @@ -137,7 +137,7 @@ echo "DEFFMTCTRY=${DEFFMTCTRY}" runTest() { - RUNCMD="${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -classpath ${TESTCLASSES} -Djava.locale.providers=$PREFLIST LocaleProviders $METHODNAME $PARAM1 $PARAM2 $PARAM3" + RUNCMD="${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -classpath ${TESTCLASSES}${PS}${SPICLASSES} -Djava.locale.providers=$PREFLIST LocaleProviders $METHODNAME $PARAM1 $PARAM2 $PARAM3" echo ${RUNCMD} ${RUNCMD} result=$? @@ -189,6 +189,7 @@ else PARAM2=zh PARAM3=CN fi +SPICLASSES= runTest # testing SPI is NOT selected, as there is none. @@ -197,6 +198,7 @@ PREFLIST=SPI,JRE PARAM1=JRE PARAM2=en PARAM3=US +SPICLASSES= runTest # testing the order, variaton #1. This assumes en_GB DateFormat data are available both in JRE & CLDR @@ -205,6 +207,7 @@ PREFLIST=CLDR,JRE PARAM1=CLDR PARAM2=en PARAM3=GB +SPICLASSES= runTest # testing the order, variaton #2. This assumes en_GB DateFormat data are available both in JRE & CLDR @@ -213,6 +216,7 @@ PREFLIST=JRE,CLDR PARAM1=JRE PARAM2=en PARAM3=GB +SPICLASSES= runTest # testing the order, variaton #3 for non-existent locale in JRE assuming "haw" is not in JRE. @@ -221,6 +225,7 @@ PREFLIST=JRE,CLDR PARAM1=CLDR PARAM2=haw PARAM3=GB +SPICLASSES= runTest # testing the order, variaton #4 for the bug 7196799. CLDR's "zh" data should be used in "zh_CN" @@ -229,6 +234,7 @@ PREFLIST=CLDR PARAM1=CLDR PARAM2=zh PARAM3=CN +SPICLASSES= runTest # testing FALLBACK provider. SPI and invalid one cases. @@ -237,16 +243,19 @@ PREFLIST=SPI PARAM1=FALLBACK PARAM2=en PARAM3=US +SPICLASSES= runTest PREFLIST=FOO PARAM1=JRE PARAM2=en PARAM3=US +SPICLASSES= runTest PREFLIST=BAR,SPI PARAM1=FALLBACK PARAM2=en PARAM3=US +SPICLASSES= runTest # testing 7198834 fix. Only works on Windows Vista or upper. @@ -255,22 +264,25 @@ PREFLIST=HOST PARAM1= PARAM2= PARAM3= +SPICLASSES= runTest # testing 8000245 fix. METHODNAME=tzNameTest -PREFLIST="JRE -Djava.ext.dirs=${SPIDIR}" +PREFLIST=JRE PARAM1=Europe/Moscow PARAM2= PARAM3= +SPICLASSES=${SPIDIR} runTest # testing 8000615 fix. METHODNAME=tzNameTest -PREFLIST="JRE -Djava.ext.dirs=${SPIDIR}" +PREFLIST=JRE PARAM1=America/Los_Angeles PARAM2= PARAM3= +SPICLASSES=${SPIDIR} runTest # testing 8001440 fix. @@ -279,6 +291,7 @@ PREFLIST=CLDR PARAM1= PARAM2= PARAM3= +SPICLASSES= runTest # testing 8010666 fix. @@ -289,15 +302,17 @@ then PARAM1= PARAM2= PARAM3= + SPICLASSES= runTest fi # testing 8013086 fix. METHODNAME=bug8013086Test -PREFLIST="JRE,SPI -Djava.ext.dirs=${SPIDIR}" +PREFLIST=JRE,SPI PARAM1=ja PARAM2=JP PARAM3= +SPICLASSES=${SPIDIR} runTest # testing 8013903 fix. (Windows only) @@ -306,12 +321,14 @@ PREFLIST=HOST,JRE PARAM1= PARAM2= PARAM3= +SPICLASSES= runTest METHODNAME=bug8013903Test PREFLIST=HOST PARAM1= PARAM2= PARAM3= +SPICLASSES= runTest # testing 8027289 fix, if the platform format default is zh_CN @@ -323,12 +340,14 @@ if [ "${DEFFMTLANG}" = "zh" ] && [ "${DEFFMTCTRY}" = "CN" ]; then PARAM1=FFE5 PARAM2= PARAM3= + SPICLASSES= runTest METHODNAME=bug8027289Test PREFLIST=HOST PARAM1=00A5 PARAM2= PARAM3= + SPICLASSES= runTest fi diff --git a/jdk/test/java/util/PluggableLocale/BreakIteratorProviderTest.sh b/jdk/test/java/util/PluggableLocale/BreakIteratorProviderTest.sh index 050d422324b..f927fb16811 100644 --- a/jdk/test/java/util/PluggableLocale/BreakIteratorProviderTest.sh +++ b/jdk/test/java/util/PluggableLocale/BreakIteratorProviderTest.sh @@ -23,6 +23,6 @@ # # # @test -# @bug 4052440 +# @bug 4052440 8062588 # @summary BreakIteratorProvider tests -# @run shell ExecTest.sh foo BreakIteratorProviderTest true +# @run shell ExecTest.sh foo BreakIteratorProviderTest diff --git a/jdk/test/java/util/PluggableLocale/CalendarDataProviderTest.sh b/jdk/test/java/util/PluggableLocale/CalendarDataProviderTest.sh index 36234d7cdc7..186f0b4b8f1 100644 --- a/jdk/test/java/util/PluggableLocale/CalendarDataProviderTest.sh +++ b/jdk/test/java/util/PluggableLocale/CalendarDataProviderTest.sh @@ -23,6 +23,6 @@ # # # @test -# @bug 7058207 8000986 +# @bug 7058207 8000986 8062588 # @summary CalendarDataProvider tests -# @run shell ExecTest.sh bar CalendarDataProviderTest true +# @run shell ExecTest.sh bar CalendarDataProviderTest diff --git a/jdk/test/java/util/PluggableLocale/CalendarNameProviderTest.sh b/jdk/test/java/util/PluggableLocale/CalendarNameProviderTest.sh index a772292b936..8883c31871b 100644 --- a/jdk/test/java/util/PluggableLocale/CalendarNameProviderTest.sh +++ b/jdk/test/java/util/PluggableLocale/CalendarNameProviderTest.sh @@ -22,6 +22,6 @@ # # @test -# @bug 8000986 +# @bug 8000986 8062588 # @summary CalendarNameProvider tests -# @run shell ExecTest.sh bar CalendarNameProviderTest true +# @run shell ExecTest.sh bar CalendarNameProviderTest diff --git a/jdk/test/java/util/PluggableLocale/ClasspathTest.java b/jdk/test/java/util/PluggableLocale/ClasspathTest.java index 2c73a3cef47..54df0491250 100644 --- a/jdk/test/java/util/PluggableLocale/ClasspathTest.java +++ b/jdk/test/java/util/PluggableLocale/ClasspathTest.java @@ -36,13 +36,13 @@ public class ClasspathTest { ClasspathTest() { /* - * Since providers can only be loaded from the extension directory, - * this test will fail if they are loaded from classpath. + * Since providers can be loaded from the application's classpath, + * this test will fail if they are NOT loaded from classpath. */ Locale OSAKA = new Locale("ja", "JP", "osaka"); List availableLocales = Arrays.asList(Locale.getAvailableLocales()); - if (availableLocales.contains(OSAKA)) { - throw new RuntimeException("LSS providers were loaded from the class path."); + if (!availableLocales.contains(OSAKA)) { + throw new RuntimeException("LSS providers were NOT loaded from the class path."); } } } diff --git a/jdk/test/java/util/PluggableLocale/ClasspathTest.sh b/jdk/test/java/util/PluggableLocale/ClasspathTest.sh index 99749540553..f19d1f928dd 100644 --- a/jdk/test/java/util/PluggableLocale/ClasspathTest.sh +++ b/jdk/test/java/util/PluggableLocale/ClasspathTest.sh @@ -23,7 +23,6 @@ # # # @test -# @bug 6388652 -# @summary Checks whether providers can only be loaded from extension directories, -# not from classpath. -# @run shell ExecTest.sh bar ClasspathTest false +# @bug 6388652 8062588 +# @summary Checks whether providers can be loaded from classpath. +# @run shell ExecTest.sh bar ClasspathTest diff --git a/jdk/test/java/util/PluggableLocale/CollatorProviderTest.sh b/jdk/test/java/util/PluggableLocale/CollatorProviderTest.sh index 01e1b277f5b..01b6fa6191b 100644 --- a/jdk/test/java/util/PluggableLocale/CollatorProviderTest.sh +++ b/jdk/test/java/util/PluggableLocale/CollatorProviderTest.sh @@ -23,6 +23,6 @@ # # # @test -# @bug 4052440 +# @bug 4052440 8062588 # @summary CollatorProvider tests -# @run shell ExecTest.sh foo CollatorProviderTest true +# @run shell ExecTest.sh foo CollatorProviderTest diff --git a/jdk/test/java/util/PluggableLocale/CurrencyNameProviderTest.sh b/jdk/test/java/util/PluggableLocale/CurrencyNameProviderTest.sh index 9e8d4f90d61..2684767ce94 100644 --- a/jdk/test/java/util/PluggableLocale/CurrencyNameProviderTest.sh +++ b/jdk/test/java/util/PluggableLocale/CurrencyNameProviderTest.sh @@ -23,6 +23,6 @@ # # # @test -# @bug 4052440 7199750 8000997 +# @bug 4052440 7199750 8000997 8062588 # @summary CurrencyNameProvider tests -# @run shell ExecTest.sh bar CurrencyNameProviderTest true +# @run shell ExecTest.sh bar CurrencyNameProviderTest diff --git a/jdk/test/java/util/PluggableLocale/DateFormatProviderTest.sh b/jdk/test/java/util/PluggableLocale/DateFormatProviderTest.sh index d8a9a288854..0d1be46b6d0 100644 --- a/jdk/test/java/util/PluggableLocale/DateFormatProviderTest.sh +++ b/jdk/test/java/util/PluggableLocale/DateFormatProviderTest.sh @@ -23,6 +23,6 @@ # # # @test -# @bug 4052440 7003643 +# @bug 4052440 7003643 8062588 # @summary DateFormatProvider tests -# @run shell ExecTest.sh foo DateFormatProviderTest true +# @run shell ExecTest.sh foo DateFormatProviderTest diff --git a/jdk/test/java/util/PluggableLocale/DateFormatSymbolsProviderTest.sh b/jdk/test/java/util/PluggableLocale/DateFormatSymbolsProviderTest.sh index 51ebe6fa630..e4191f01eaf 100644 --- a/jdk/test/java/util/PluggableLocale/DateFormatSymbolsProviderTest.sh +++ b/jdk/test/java/util/PluggableLocale/DateFormatSymbolsProviderTest.sh @@ -23,6 +23,6 @@ # # # @test -# @bug 4052440 7200341 +# @bug 4052440 7200341 8062588 # @summary DateFormatSymbolsProvider tests -# @run shell ExecTest.sh foo DateFormatSymbolsProviderTest true +# @run shell ExecTest.sh foo DateFormatSymbolsProviderTest diff --git a/jdk/test/java/util/PluggableLocale/DecimalFormatSymbolsProviderTest.sh b/jdk/test/java/util/PluggableLocale/DecimalFormatSymbolsProviderTest.sh index 7d6e9bf8ada..e4dc5864768 100644 --- a/jdk/test/java/util/PluggableLocale/DecimalFormatSymbolsProviderTest.sh +++ b/jdk/test/java/util/PluggableLocale/DecimalFormatSymbolsProviderTest.sh @@ -23,6 +23,6 @@ # # # @test -# @bug 4052440 +# @bug 4052440 8062588 # @summary DecimalFormatSymbolsProvider tests -# @run shell ExecTest.sh foo DecimalFormatSymbolsProviderTest true +# @run shell ExecTest.sh foo DecimalFormatSymbolsProviderTest diff --git a/jdk/test/java/util/PluggableLocale/ExecTest.sh b/jdk/test/java/util/PluggableLocale/ExecTest.sh index a30d70312d2..7e8a5365f45 100644 --- a/jdk/test/java/util/PluggableLocale/ExecTest.sh +++ b/jdk/test/java/util/PluggableLocale/ExecTest.sh @@ -76,14 +76,6 @@ case "$OS" in ;; esac -# set classpath and extension directory variables -if [ -d ${TESTJAVA}${FS}lib${FS}ext ] -then - EXTDIRS="${TESTJAVA}${FS}lib${FS}ext${PS}${TESTCLASSES}" -else - EXTDIRS="${TESTJAVA}${FS}jre${FS}lib${FS}ext${PS}${TESTCLASSES}" -fi - case "$1" in "foo" ) cp ${TESTSRC}${FS}fooprovider.jar ${TESTCLASSES} @@ -122,12 +114,7 @@ else fi # run -if [ "$3" = "true" ] -then - RUNCMD="${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -Djava.ext.dirs=${EXTDIRS} $2 " -else - RUNCMD="${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -classpath ${CLASSPATHARG} $2 " -fi +RUNCMD="${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -classpath ${CLASSPATHARG} $2 " echo ${RUNCMD} ${RUNCMD} diff --git a/jdk/test/java/util/PluggableLocale/GenericTest.sh b/jdk/test/java/util/PluggableLocale/GenericTest.sh index 0d53be11c3e..d1906e1c61f 100644 --- a/jdk/test/java/util/PluggableLocale/GenericTest.sh +++ b/jdk/test/java/util/PluggableLocale/GenericTest.sh @@ -23,6 +23,6 @@ # # # @test -# @bug 4052440 +# @bug 4052440 8062588 # @summary Generic tests for the pluggable locales feature -# @run shell ExecTest.sh foobar GenericTest true +# @run shell ExecTest.sh foobar GenericTest diff --git a/jdk/test/java/util/PluggableLocale/LocaleNameProviderTest.sh b/jdk/test/java/util/PluggableLocale/LocaleNameProviderTest.sh index 489c92c779e..3619533c0a3 100644 --- a/jdk/test/java/util/PluggableLocale/LocaleNameProviderTest.sh +++ b/jdk/test/java/util/PluggableLocale/LocaleNameProviderTest.sh @@ -23,6 +23,6 @@ # # # @test -# @bug 4052440 8000273 +# @bug 4052440 8000273 8062588 # @summary LocaleNameProvider tests -# @run shell ExecTest.sh bar LocaleNameProviderTest true +# @run shell ExecTest.sh bar LocaleNameProviderTest diff --git a/jdk/test/java/util/PluggableLocale/NumberFormatProviderTest.sh b/jdk/test/java/util/PluggableLocale/NumberFormatProviderTest.sh index 1c952e84de8..e38b9563deb 100644 --- a/jdk/test/java/util/PluggableLocale/NumberFormatProviderTest.sh +++ b/jdk/test/java/util/PluggableLocale/NumberFormatProviderTest.sh @@ -23,6 +23,6 @@ # # # @test -# @bug 4052440 7003643 +# @bug 4052440 7003643 8062588 # @summary NumberFormatProvider tests -# @run shell ExecTest.sh foo NumberFormatProviderTest true +# @run shell ExecTest.sh foo NumberFormatProviderTest diff --git a/jdk/test/java/util/PluggableLocale/TimeZoneNameProviderTest.sh b/jdk/test/java/util/PluggableLocale/TimeZoneNameProviderTest.sh index 88f05c498d3..f80874b68fe 100644 --- a/jdk/test/java/util/PluggableLocale/TimeZoneNameProviderTest.sh +++ b/jdk/test/java/util/PluggableLocale/TimeZoneNameProviderTest.sh @@ -23,6 +23,6 @@ # # # @test -# @bug 4052440 8003267 +# @bug 4052440 8003267 8062588 # @summary TimeZoneNameProvider tests -# @run shell ExecTest.sh bar TimeZoneNameProviderTest true +# @run shell ExecTest.sh bar TimeZoneNameProviderTest diff --git a/jdk/test/java/util/ResourceBundle/Bug6299235Test.sh b/jdk/test/java/util/ResourceBundle/Bug6299235Test.sh index 7d1d256a0e6..a29c7444ecb 100644 --- a/jdk/test/java/util/ResourceBundle/Bug6299235Test.sh +++ b/jdk/test/java/util/ResourceBundle/Bug6299235Test.sh @@ -55,27 +55,14 @@ if [ -z "${TESTJAVA}" ]; then exit 1 fi -# See if TESTJAVA points to JRE or JDK -if [ -d "${TESTJAVA}${FILESEP}jre" ]; then - JRE_EXT_DIR=${TESTJAVA}${FILESEP}jre${FILESEP}lib${FILESEP}ext -else - JRE_EXT_DIR=${TESTJAVA}${FILESEP}lib${FILESEP}ext -fi - -if [ -d "${JRE_EXT_DIR}" ]; then - NEW_EXT_DIR="${JRE_EXT_DIR}${PATHSEP}${TESTSRC}" -else - NEW_EXT_DIR=${TESTSRC} -fi - echo "TESTJAVA=${TESTJAVA}" echo "TESTSRC=${TESTSRC}" echo "TESTCLASSES=${TESTCLASSES}" echo "NEW_EXT_DIR=${NEW_EXT_DIR}" cd ${TESTSRC} - -${TESTJAVA}/bin/java ${TESTVMOPTS} -cp ${TESTCLASSES} -Djava.ext.dirs=${NEW_EXT_DIR} Bug6299235Test +echo +${TESTJAVA}/bin/java ${TESTVMOPTS} -cp ${TESTCLASSES}${PATHSEP}${TESTSRC}${FILESEP}awtres.jar Bug6299235Test if [ $? -ne 0 ] then From 2a50c5f3c480acece57876877dfb73d8de2125fe Mon Sep 17 00:00:00 2001 From: Aleksei Efimov Date: Tue, 16 Dec 2014 23:59:57 +0300 Subject: [PATCH 14/20] 8051641: Africa/Casablanca transitions is incorrectly calculated starting from 2027 Reviewed-by: sherman --- .../classes/build/tools/tzdb/TzdbZoneRulesProvider.java | 2 +- jdk/test/ProblemList.txt | 3 --- jdk/test/sun/util/calendar/zi/Rule.java | 8 ++++++++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/jdk/make/src/classes/build/tools/tzdb/TzdbZoneRulesProvider.java b/jdk/make/src/classes/build/tools/tzdb/TzdbZoneRulesProvider.java index a59ce61eff9..4c92ee9a8af 100644 --- a/jdk/make/src/classes/build/tools/tzdb/TzdbZoneRulesProvider.java +++ b/jdk/make/src/classes/build/tools/tzdb/TzdbZoneRulesProvider.java @@ -758,8 +758,8 @@ class TzdbZoneRulesProvider { if (endYear == Year.MAX_VALUE) { endYear = startYear; lastRules.add(new TransRule(endYear, rule)); - lastRulesStartYear = Math.max(startYear, lastRulesStartYear); } + lastRulesStartYear = Math.max(startYear, lastRulesStartYear); } else { if (endYear == Year.MAX_VALUE) { //endYear = zoneEnd.getYear(); diff --git a/jdk/test/ProblemList.txt b/jdk/test/ProblemList.txt index 1f54f49b22d..d6b5d46898f 100644 --- a/jdk/test/ProblemList.txt +++ b/jdk/test/ProblemList.txt @@ -303,9 +303,6 @@ com/sun/jdi/RedefinePop.sh generic-all # jdk_util -# 8051641 -sun/util/calendar/zi/TestZoneInfo310.java generic-all - # 8062512 java/util/spi/ResourceBundleControlProvider/UserDefaultControlTest.java generic-all diff --git a/jdk/test/sun/util/calendar/zi/Rule.java b/jdk/test/sun/util/calendar/zi/Rule.java index ee4df5b228c..a30f2c04e28 100644 --- a/jdk/test/sun/util/calendar/zi/Rule.java +++ b/jdk/test/sun/util/calendar/zi/Rule.java @@ -126,6 +126,14 @@ class Rule { }); rules.clear(); for (int i = 0; i < n; i++) { + if (i != 0 && recs[i -1].getSave() == recs[i].getSave()) { + // we have two recs back to back with same saving for the same year. + if (recs[i].isLastRule()) { + continue; + } else if (recs[i - 1].isLastRule()) { + rules.remove(rules.size() - 1); + } + } rules.add(recs[i]); } return rules; From 9e2cda5c0230f07ef0a045793123bf61f3f4be07 Mon Sep 17 00:00:00 2001 From: Stuart Marks Date: Tue, 16 Dec 2014 13:45:20 -0800 Subject: [PATCH 15/20] 8035117: TEST_BUG: java/rmi/server/RemoteObject/notExtending/NotExtending.java can fail with timeout Reviewed-by: lancea --- .../notExtending/NotExtending.java | 67 ++++++------------- 1 file changed, 22 insertions(+), 45 deletions(-) diff --git a/jdk/test/java/rmi/server/RemoteObject/notExtending/NotExtending.java b/jdk/test/java/rmi/server/RemoteObject/notExtending/NotExtending.java index fd5ef1eacce..5b6aae6ac26 100644 --- a/jdk/test/java/rmi/server/RemoteObject/notExtending/NotExtending.java +++ b/jdk/test/java/rmi/server/RemoteObject/notExtending/NotExtending.java @@ -30,7 +30,7 @@ * @author Peter Jones * * @build NotExtending_Stub NotExtending_Skel - * @run main/othervm/timeout=240 NotExtending + * @run main/othervm NotExtending */ @@ -46,9 +46,16 @@ public class NotExtending implements Remote { /** true if the hashValue field has been initialized */ private boolean hashValueInitialized = false; - public NotExtending() throws RemoteException { + // no declared constructor - rely on implicit no-arg contructor + + public Remote export() throws RemoteException { stub = UnicastRemoteObject.exportObject(this); setHashValue(stub.hashCode()); + return stub; + } + + public void unexport() throws RemoteException { + UnicastRemoteObject.unexportObject(this, true); } private void setHashValue(int value) { @@ -58,12 +65,11 @@ public class NotExtending implements Remote { public int hashCode() { /* - * Test fails with a RuntimeException if the hashCode() method is - * called (during the export procedure) before the correct hash - * value has been initialized. + * Test fails if the hashCode() method is called (during export) + * before the correct hash value has been initialized. */ if (!hashValueInitialized) { - throw new RuntimeException( + throw new AssertionError( "hashCode() invoked before hashValue initialized"); } return hashValue; @@ -74,69 +80,40 @@ public class NotExtending implements Remote { } public static void main(String[] args) throws Exception { - /* - * The following line is required with the JDK 1.2 VM so that the - * VM can exit gracefully when this test completes. Otherwise, the - * conservative garbage collector will find a handle to the server - * object on the native stack and not clear the weak reference to - * it in the RMI runtime's object table. - */ - Object dummy = new Object(); + NotExtending server = null; - NotExtending server; try { /* * Verify that hashCode() is not invoked before it is * initialized. Tests bugid 4102938. */ server = new NotExtending(); + Remote stub = server.export(); System.err.println("Server exported without invoking hashCode()."); /* * Verify that passing stub to server's equals() method * returns true. */ - if (server.equals(server.stub)) { - System.err.println( - "Passing stub to server's equals() method succeeded."); + if (server.equals(stub)) { + System.err.println("server.equals(stub) returns true"); } else { - throw new RuntimeException( - "passing stub to server's equals() method failed"); + throw new AssertionError("server.equals(stub) returns false"); } /* * Verify that passing server to stub's equals() method * returns true. Tests bugid 4099660. */ - if (server.stub.equals(server)) { - System.err.println( - "Passing server to stub's equals() method succeeded."); + if (stub.equals(server)) { + System.err.println("stub.equals(server) returns true"); } else { - throw new RuntimeException( - "passing server to stub's equals() method failed"); + throw new AssertionError("stub.equals(server) returns false"); } - } finally { - server = null; - flushCachedRefs(); - } - } - - /** - * Force desperate garbage collection so that soft references - * will be cleared. - * - * This method is required with the JDK 1.1.x RMI runtime so that the - * VM can exit gracefully when this test completes. See bugid 4006356. - */ - public static void flushCachedRefs() { - java.util.Vector chain = new java.util.Vector(); - try { - while (true) { - int[] hungry = new int[65536]; - chain.addElement(hungry); + if (server != null) { + server.unexport(); } - } catch (OutOfMemoryError e) { } } } From f8fe49013dacfa5c7837b07f57828afbfdd1fcc9 Mon Sep 17 00:00:00 2001 From: Kumar Srinivasan Date: Tue, 16 Dec 2014 16:02:56 -0800 Subject: [PATCH 16/20] 8067421: java -help contains information about "-version:",'-jre-restrict-search', '-no-jre-restrict-search', but they are removed 8067411: tools/launcher/MultipleJRE.sh requires adjustments to work with module boundaries 8067290: Missing bug id in test/tools/launcher/* Reviewed-by: darcy --- .../launcher/resources/launcher.properties | 6 +-- jdk/test/tools/launcher/MultipleJRE.sh | 40 ++++++++++++++++--- jdk/test/tools/launcher/PrintVersion.java | 11 ++--- jdk/test/tools/launcher/UglyPrintVersion.java | 12 ++---- 4 files changed, 44 insertions(+), 25 deletions(-) diff --git a/jdk/src/java.base/share/classes/sun/launcher/resources/launcher.properties b/jdk/src/java.base/share/classes/sun/launcher/resources/launcher.properties index cfdf9a9c7a5..03ee5c62629 100644 --- a/jdk/src/java.base/share/classes/sun/launcher/resources/launcher.properties +++ b/jdk/src/java.base/share/classes/sun/launcher/resources/launcher.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2007, 2014, 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 @@ -46,11 +46,7 @@ java.launcher.opt.footer =\ -cp \n\ -\ require the specified version to run\n\ \ -showversion print product version and continue\n\ -\ -jre-restrict-search | -no-jre-restrict-search\n\ -\ include/exclude user private JREs in the version search\n\ \ -? -help print this help message\n\ \ -X print help on non-standard options\n\ \ -ea[:...|:]\n\ diff --git a/jdk/test/tools/launcher/MultipleJRE.sh b/jdk/test/tools/launcher/MultipleJRE.sh index 61cac1b3eb9..a0576b2288c 100644 --- a/jdk/test/tools/launcher/MultipleJRE.sh +++ b/jdk/test/tools/launcher/MultipleJRE.sh @@ -1,15 +1,14 @@ #!/bin/sh # @test MultipleJRE.sh -# @bug 4811102 4953711 4955505 4956301 4991229 4998210 5018605 6387069 6733959 +# @bug 4811102 4953711 4955505 4956301 4991229 4998210 5018605 6387069 6733959 8058407 8067421 # @build PrintVersion # @build UglyPrintVersion # @build ZipMeUp # @run shell MultipleJRE.sh # @summary Verify Multiple JRE version support has been removed # @author Joseph E. Kowalski - # -# Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2003, 2014, 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 @@ -90,6 +89,36 @@ TestSyntax() { fi } +# +# Shell routine to ensure help page does not include mjre options +# +TestHelp() { + mess="`$JAVA -help 2>&1`" + # make sure it worked + if [ $? -ne 0 ]; then + echo "java -help failed ????" + exit 1 + fi + + echo $mess | grep '\-version:' > /dev/null 2>&1 + if [ $? -eq 0 ]; then + echo "help message contains obsolete option version:" + exit 1 + fi + + echo $mess | grep '\-jre-restrict-search' > /dev/null 2>&1 + if [ $? -eq 0 ]; then + echo "help message contains obsolete option jre-restrict-search" + exit 1 + fi + + echo $mess | grep '\-no-jre-restrict-search' > /dev/null 2>&1 + if [ $? -eq 0 ]; then + echo "help message contains obsolete option no-jre-restrict-search" + exit 1 + fi +} + # # Just as the name says. We sprinkle these in the appropriate location # in the test file system and they just say who they are pretending to be. @@ -457,7 +486,8 @@ fi LaunchVM "" "${RELEASE}" # Going to silently ignore JRE-Version setting in jar file manifest #LaunchVM "" "warning: The jarfile JRE-Version" - + + # Verify help does not contain obsolete options + TestHelp exit 0 - diff --git a/jdk/test/tools/launcher/PrintVersion.java b/jdk/test/tools/launcher/PrintVersion.java index 3f9f05d4b84..424e98e3f53 100644 --- a/jdk/test/tools/launcher/PrintVersion.java +++ b/jdk/test/tools/launcher/PrintVersion.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2014, 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 @@ -27,12 +27,9 @@ * This stub simply prints out the java version string. It is used * by MultipleJRE.sh. */ -import sun.misc.Version; public class PrintVersion { - - public static void main(String argv[]) { - Version.print(); - } - + public static void main(String argv[]) { + System.out.println(System.getProperty("java.version")); + } } diff --git a/jdk/test/tools/launcher/UglyPrintVersion.java b/jdk/test/tools/launcher/UglyPrintVersion.java index fa0ebed68ed..c61e7c4cdd9 100644 --- a/jdk/test/tools/launcher/UglyPrintVersion.java +++ b/jdk/test/tools/launcher/UglyPrintVersion.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2014, 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 @@ -30,12 +30,8 @@ */ package reallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallylongpackagename; -import sun.misc.Version; - public class UglyPrintVersion { - - public static void main(String argv[]) { - Version.print(); - } - + public static void main(String argv[]) { + System.out.println(System.getProperty("java.version")); + } } From 024e2c06d7b536199d649111c234d50615f0726d Mon Sep 17 00:00:00 2001 From: Pavel Rappo Date: Wed, 17 Dec 2014 13:03:29 +0000 Subject: [PATCH 17/20] 8066642: Fix deprecation warnings in jdk.naming module Reviewed-by: alanb, chegar --- .../classes/com/sun/jndi/rmi/registry/RegistryContext.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/jdk/src/jdk.naming.rmi/share/classes/com/sun/jndi/rmi/registry/RegistryContext.java b/jdk/src/jdk.naming.rmi/share/classes/com/sun/jndi/rmi/registry/RegistryContext.java index cf3de07fe79..720a1ff940f 100644 --- a/jdk/src/jdk.naming.rmi/share/classes/com/sun/jndi/rmi/registry/RegistryContext.java +++ b/jdk/src/jdk.naming.rmi/share/classes/com/sun/jndi/rmi/registry/RegistryContext.java @@ -353,7 +353,6 @@ public class RegistryContext implements Context, Referenceable { /** * Wrap a RemoteException inside a NamingException. */ - @SuppressWarnings("deprecation") public static NamingException wrapRemoteException(RemoteException re) { NamingException ne; @@ -365,8 +364,7 @@ public class RegistryContext implements Context, Referenceable { ne = new NoPermissionException(); } else if (re instanceof StubNotFoundException || - re instanceof UnknownHostException || - re instanceof SocketSecurityException) { + re instanceof UnknownHostException) { ne = new ConfigurationException(); } else if (re instanceof ExportException || @@ -414,11 +412,10 @@ public class RegistryContext implements Context, Referenceable { * Attempts to install a security manager if none is currently in * place. */ - @SuppressWarnings("deprecation") private static void installSecurityMgr() { try { - System.setSecurityManager(new RMISecurityManager()); + System.setSecurityManager(new SecurityManager()); } catch (Exception e) { } } From d21522574061ba27c323c00a72f2337155ff7c71 Mon Sep 17 00:00:00 2001 From: Felix Yang Date: Wed, 17 Dec 2014 13:41:49 -0800 Subject: [PATCH 18/20] 8061442: Update jdk/tools tests to remove check for the "jre" directory Reviewed-by: alanb, ksrini --- jdk/test/tools/jar/JarEntryTime.java | 5 +---- .../tools/launcher/ExecutionEnvironment.java | 6 +++--- jdk/test/tools/launcher/TestHelper.java | 18 ++++-------------- 3 files changed, 8 insertions(+), 21 deletions(-) diff --git a/jdk/test/tools/jar/JarEntryTime.java b/jdk/test/tools/jar/JarEntryTime.java index f266a511306..4f29b8e7a63 100644 --- a/jdk/test/tools/jar/JarEntryTime.java +++ b/jdk/test/tools/jar/JarEntryTime.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2014, 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 @@ -51,9 +51,6 @@ public class JarEntryTime { static void extractJar(File jarFile, boolean useExtractionTime) throws Throwable { String javahome = System.getProperty("java.home"); - if (javahome.endsWith("jre")) { - javahome = javahome.substring(0, javahome.length() - 4); - } String jarcmd = javahome + File.separator + "bin" + File.separator + "jar"; String[] args; if (useExtractionTime) { diff --git a/jdk/test/tools/launcher/ExecutionEnvironment.java b/jdk/test/tools/launcher/ExecutionEnvironment.java index f78649f364c..894c9a252fa 100644 --- a/jdk/test/tools/launcher/ExecutionEnvironment.java +++ b/jdk/test/tools/launcher/ExecutionEnvironment.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2014, 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 @@ -45,7 +45,7 @@ * a. if LD_LIBRARY_PATH64 is set it will override LD_LIBRARY_PATH * b. LD_LIBRARY_PATH32 is ignored if set * 5. no extra symlink exists on Solaris ie. - * jre/lib/$arch/libjvm.so -> client/libjvm.so + * lib/$arch/libjvm.so -> client/libjvm.so * TODO: * a. perhaps we need to add a test to audit all environment variables are * in pristine condition after the launch, there may be a few that the @@ -267,7 +267,7 @@ public class ExecutionEnvironment extends TestHelper { } File symLink = null; - String libPathPrefix = isSDK ? "jre/lib" : "/lib"; + String libPathPrefix = "/lib"; symLink = new File(JAVAHOME, libPathPrefix + getJreArch() + "/" + LIBJVM); if (symLink.exists()) { diff --git a/jdk/test/tools/launcher/TestHelper.java b/jdk/test/tools/launcher/TestHelper.java index 840e67ead20..9a37c5a536e 100644 --- a/jdk/test/tools/launcher/TestHelper.java +++ b/jdk/test/tools/launcher/TestHelper.java @@ -67,10 +67,7 @@ public class TestHelper { static final String JAVAHOME = System.getProperty("java.home"); static final String JAVA_BIN; - static final String JAVA_JRE_BIN; static final String JAVA_LIB; - static final String JAVA_JRE_LIB; - static final boolean isSDK = JAVAHOME.endsWith("jre"); static final String javaCmd; static final String javawCmd; static final String javacCmd; @@ -135,17 +132,10 @@ public class TestHelper { } compiler = ToolProvider.getSystemJavaCompiler(); - File binDir = (isSDK) - ? new File((new File(JAVAHOME)).getParentFile(), "bin") - : new File(JAVAHOME, "bin"); + File binDir = new File(JAVAHOME, "bin"); JAVA_BIN = binDir.getAbsolutePath(); - JAVA_JRE_BIN = new File(JAVAHOME, "bin").getAbsolutePath(); - - File libDir = (isSDK) - ? new File((new File(JAVAHOME)).getParentFile(), "lib") - : new File(JAVAHOME, "lib"); + File libDir = new File(JAVAHOME, "lib"); JAVA_LIB = libDir.getAbsolutePath(); - JAVA_JRE_LIB = new File(JAVAHOME, "lib").getAbsolutePath(); File javaCmdFile = (isWindows) ? new File(binDir, "java.exe") @@ -191,11 +181,11 @@ public class TestHelper { } private static boolean haveVmVariant(String type) { if (isWindows) { - File vmDir = new File(JAVA_JRE_BIN, type); + File vmDir = new File(JAVA_BIN, type); File jvmFile = new File(vmDir, LIBJVM); return jvmFile.exists(); } else { - File vmDir = new File(JAVA_JRE_LIB, type); + File vmDir = new File(JAVA_LIB, type); File vmArchDir = new File(vmDir, getJreArch()); File jvmFile = new File(vmArchDir, LIBJVM); return jvmFile.exists(); From 69df2fa9e574790fa283bbc58d477b52150ef63d Mon Sep 17 00:00:00 2001 From: Pavel Rappo Date: Thu, 18 Dec 2014 16:44:32 +0000 Subject: [PATCH 19/20] 8067870: Fix java.io.ObjectInputStream.PeekInputStream#skip Reviewed-by: rriggs, alanb --- .../classes/java/io/ObjectInputStream.java | 2 +- .../PeekInputStreamTest.java | 91 +++++++++++++++++++ 2 files changed, 92 insertions(+), 1 deletion(-) create mode 100644 jdk/test/java/io/ObjectInputStream/PeekInputStreamTest.java diff --git a/jdk/src/java.base/share/classes/java/io/ObjectInputStream.java b/jdk/src/java.base/share/classes/java/io/ObjectInputStream.java index e65c8ae316a..fca32fb4daf 100644 --- a/jdk/src/java.base/share/classes/java/io/ObjectInputStream.java +++ b/jdk/src/java.base/share/classes/java/io/ObjectInputStream.java @@ -2345,7 +2345,7 @@ public class ObjectInputStream skipped++; n--; } - return skipped + skip(n); + return skipped + in.skip(n); } public int available() throws IOException { diff --git a/jdk/test/java/io/ObjectInputStream/PeekInputStreamTest.java b/jdk/test/java/io/ObjectInputStream/PeekInputStreamTest.java new file mode 100644 index 00000000000..86e8001a63e --- /dev/null +++ b/jdk/test/java/io/ObjectInputStream/PeekInputStreamTest.java @@ -0,0 +1,91 @@ +/* + * Copyright (c) 2014, 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.lang.reflect.Constructor; +import java.lang.reflect.Method; + +/* + * @test + * @bug 8067870 + * @summary verifies java.io.ObjectInputStream.PeekInputStream.skip works + * as intended + */ +public class PeekInputStreamTest { + + public static void main(String[] args) throws ReflectiveOperationException, + IOException { + + InputStream pin = createPeekInputStream( + new ByteArrayInputStream(new byte[]{1, 2, 3, 4})); + peek(pin); + if (pin.skip(1) != 1 || pin.read() != 2) + throw new AssertionError(); + + InputStream pin1 = createPeekInputStream( + new ByteArrayInputStream(new byte[]{1, 2, 3, 4})); + if (pin1.skip(1) != 1 || pin1.read() != 2) + throw new AssertionError(); + + InputStream pin2 = createPeekInputStream( + new ByteArrayInputStream(new byte[]{1, 2, 3, 4})); + if (pin2.skip(0) != 0 || pin2.read() != 1) + throw new AssertionError(); + + InputStream pin3 = createPeekInputStream( + new ByteArrayInputStream(new byte[]{1, 2, 3, 4})); + if (pin3.skip(2) != 2 || pin3.read() != 3) + throw new AssertionError(); + + InputStream pin4 = createPeekInputStream( + new ByteArrayInputStream(new byte[]{1, 2, 3, 4})); + if (pin4.skip(3) != 3 || pin4.read() != 4) + throw new AssertionError(); + + InputStream pin5 = createPeekInputStream( + new ByteArrayInputStream(new byte[]{1, 2, 3, 4})); + if (pin5.skip(16) != 4 || pin5.read() != -1) + throw new AssertionError(); + } + + private static InputStream createPeekInputStream(InputStream underlying) + throws ReflectiveOperationException { + Class clazz = + Class.forName("java.io.ObjectInputStream$PeekInputStream") + .asSubclass(InputStream.class); + + Constructor ctr = + clazz.getDeclaredConstructor(InputStream.class); + ctr.setAccessible(true); + return ctr.newInstance(underlying); + } + + private static void peek(InputStream pin) + throws ReflectiveOperationException { + Method p = pin.getClass().getDeclaredMethod("peek"); + p.setAccessible(true); + p.invoke(pin); + } +} From ddcbf6138900d2f3a6c550ceea5a01e096819323 Mon Sep 17 00:00:00 2001 From: Lance Andersen Date: Thu, 18 Dec 2014 18:51:28 -0500 Subject: [PATCH 20/20] 8067904: Additional DriverManager clean-up from 8060068 Reviewed-by: mchung --- .../share/classes/java/sql/DriverManager.java | 178 +++++++++--------- 1 file changed, 88 insertions(+), 90 deletions(-) diff --git a/jdk/src/java.sql/share/classes/java/sql/DriverManager.java b/jdk/src/java.sql/share/classes/java/sql/DriverManager.java index bd24b3dfbb1..d5d5d43bfc2 100644 --- a/jdk/src/java.sql/share/classes/java/sql/DriverManager.java +++ b/jdk/src/java.sql/share/classes/java/sql/DriverManager.java @@ -29,7 +29,6 @@ import java.util.Iterator; import java.util.ServiceLoader; import java.security.AccessController; import java.security.PrivilegedAction; -import java.util.PropertyPermission; import java.util.concurrent.CopyOnWriteArrayList; import sun.reflect.CallerSensitive; import sun.reflect.Reflection; @@ -89,6 +88,8 @@ public class DriverManager { private static volatile java.io.PrintStream logStream = null; // Used in println() to synchronize logWriter private final static Object logSync = new Object(); + // Used in ensureDriversInitialized() to synchronize driversInitialized + private final static Object lockForInitDrivers = new Object(); private static volatile boolean driversInitialized; private static final String JDBC_DRIVERS_PROPERTY = "jdbc.drivers"; @@ -280,11 +281,13 @@ public class DriverManager { println("DriverManager.getDriver(\"" + url + "\")"); + ensureDriversInitialized(); + Class callerClass = Reflection.getCallerClass(); // Walk through the loaded registeredDrivers attempting to locate someone // who understands the given URL. - for (DriverInfo aDriver : getRegisteredDrivers()) { + for (DriverInfo aDriver : registeredDrivers) { // If the caller does not have permission to load the driver then // skip it. if (isDriverAllowed(aDriver.driver, callerClass)) { @@ -384,8 +387,7 @@ public class DriverManager { * @see SecurityManager#checkPermission */ @CallerSensitive - public static synchronized void deregisterDriver(Driver driver) - throws SQLException { + public static void deregisterDriver(Driver driver) throws SQLException { if (driver == null) { return; } @@ -398,22 +400,24 @@ public class DriverManager { println("DriverManager.deregisterDriver: " + driver); DriverInfo aDriver = new DriverInfo(driver, null); - if (registeredDrivers.contains(aDriver)) { - if (isDriverAllowed(driver, Reflection.getCallerClass())) { - DriverInfo di = registeredDrivers.get(registeredDrivers.indexOf(aDriver)); - // If a DriverAction was specified, Call it to notify the - // driver that it has been deregistered - if (di.action() != null) { - di.action().deregister(); - } - registeredDrivers.remove(aDriver); + synchronized (lockForInitDrivers) { + if (registeredDrivers.contains(aDriver)) { + if (isDriverAllowed(driver, Reflection.getCallerClass())) { + DriverInfo di = registeredDrivers.get(registeredDrivers.indexOf(aDriver)); + // If a DriverAction was specified, Call it to notify the + // driver that it has been deregistered + if (di.action() != null) { + di.action().deregister(); + } + registeredDrivers.remove(aDriver); + } else { + // If the caller does not have permission to load the driver then + // throw a SecurityException. + throw new SecurityException(); + } } else { - // If the caller does not have permission to load the driver then - // throw a SecurityException. - throw new SecurityException(); + println(" couldn't find driver to unload"); } - } else { - println(" couldn't find driver to unload"); } } @@ -430,10 +434,12 @@ public class DriverManager { public static java.util.Enumeration getDrivers() { java.util.Vector result = new java.util.Vector<>(); + ensureDriversInitialized(); + Class callerClass = Reflection.getCallerClass(); // Walk through the loaded registeredDrivers. - for (DriverInfo aDriver : getRegisteredDrivers()) { + for (DriverInfo aDriver : registeredDrivers) { // If the caller does not have permission to load the driver then // skip it. if (isDriverAllowed(aDriver.driver, callerClass)) { @@ -557,92 +563,82 @@ public class DriverManager { return result; } - /* - * Return the registered java.sql.Drivers and call loadInitialDrivers - * if needed - */ - private static CopyOnWriteArrayList getRegisteredDrivers() { - // Check to see if we need to load the initial drivers - if (!driversInitialized) { - loadInitialDrivers(); - } - return registeredDrivers; - - } - /* * Load the initial JDBC drivers by checking the System property - * jdbc.properties and then use the {@code ServiceLoader} mechanism + * jdbc.drivers and then use the {@code ServiceLoader} mechanism */ - private synchronized static void loadInitialDrivers() { - String drivers; - + private static void ensureDriversInitialized() { if (driversInitialized) { return; } - try { - drivers = AccessController.doPrivileged(new PrivilegedAction() { - public String run() { - return System.getProperty(JDBC_DRIVERS_PROPERTY); + synchronized (lockForInitDrivers) { + if (driversInitialized) { + return; + } + String drivers; + try { + drivers = AccessController.doPrivileged(new PrivilegedAction() { + public String run() { + return System.getProperty(JDBC_DRIVERS_PROPERTY); + } + }); + } catch (Exception ex) { + drivers = null; + } + // If the driver is packaged as a Service Provider, load it. + // Get all the drivers through the classloader + // exposed as a java.sql.Driver.class service. + // ServiceLoader.load() replaces the sun.misc.Providers() + + AccessController.doPrivileged(new PrivilegedAction() { + public Void run() { + + ServiceLoader loadedDrivers = ServiceLoader.load(Driver.class); + Iterator driversIterator = loadedDrivers.iterator(); + + /* Load these drivers, so that they can be instantiated. + * It may be the case that the driver class may not be there + * i.e. there may be a packaged driver with the service class + * as implementation of java.sql.Driver but the actual class + * may be missing. In that case a java.util.ServiceConfigurationError + * will be thrown at runtime by the VM trying to locate + * and load the service. + * + * Adding a try catch block to catch those runtime errors + * if driver not available in classpath but it's + * packaged as service and that service is there in classpath. + */ + try { + while (driversIterator.hasNext()) { + driversIterator.next(); + } + } catch (Throwable t) { + // Do nothing + } + return null; } }); - } catch (Exception ex) { - drivers = null; - } - // If the driver is packaged as a Service Provider, load it. - // Get all the drivers through the classloader - // exposed as a java.sql.Driver.class service. - // ServiceLoader.load() replaces the sun.misc.Providers() - AccessController.doPrivileged(new PrivilegedAction() { - public Void run() { + println("DriverManager.initialize: jdbc.drivers = " + drivers); - ServiceLoader loadedDrivers = ServiceLoader.load(Driver.class); - Iterator driversIterator = loadedDrivers.iterator(); - - /* Load these drivers, so that they can be instantiated. - * It may be the case that the driver class may not be there - * i.e. there may be a packaged driver with the service class - * as implementation of java.sql.Driver but the actual class - * may be missing. In that case a java.util.ServiceConfigurationError - * will be thrown at runtime by the VM trying to locate - * and load the service. - * - * Adding a try catch block to catch those runtime errors - * if driver not available in classpath but it's - * packaged as service and that service is there in classpath. - */ - try{ - while(driversIterator.hasNext()) { - driversIterator.next(); + if (drivers != null && !drivers.equals("")) { + String[] driversList = drivers.split(":"); + println("number of Drivers:" + driversList.length); + for (String aDriver : driversList) { + try { + println("DriverManager.Initialize: loading " + aDriver); + Class.forName(aDriver, true, + ClassLoader.getSystemClassLoader()); + } catch (Exception ex) { + println("DriverManager.Initialize: load failed: " + ex); } - } catch(Throwable t) { - // Do nothing } - return null; } - }); - println("DriverManager.initialize: jdbc.drivers = " + drivers); - - if (drivers == null || drivers.equals("")) { - return; + driversInitialized = true; + println("JDBC DriverManager initialized"); } - String[] driversList = drivers.split(":"); - println("number of Drivers:" + driversList.length); - for (String aDriver : driversList) { - try { - println("DriverManager.Initialize: loading " + aDriver); - Class.forName(aDriver, true, - ClassLoader.getSystemClassLoader()); - } catch (Exception ex) { - println("DriverManager.Initialize: load failed: " + ex); - } - } - - driversInitialized = true; - println("JDBC DriverManager initialized"); } @@ -666,11 +662,13 @@ public class DriverManager { println("DriverManager.getConnection(\"" + url + "\")"); + ensureDriversInitialized(); + // Walk through the loaded registeredDrivers attempting to make a connection. // Remember the first exception that gets raised so we can reraise it. SQLException reason = null; - for (DriverInfo aDriver : getRegisteredDrivers()) { + for (DriverInfo aDriver : registeredDrivers) { // If the caller does not have permission to load the driver then // skip it. if (isDriverAllowed(aDriver.driver, callerCL)) {