# HG changeset patch
# User andrew
# Date 1625199174 -3600
# Fri Jul 02 05:12:54 2021 +0100
# Node ID 2da15443e65968ad2647321a1a55f69e1748e65d
# Parent 202ae03a591e2e8ec5307613d5c143bff280cf26
# Parent 8f0c77f98b2ab47d4627d34eb0943b1e9b331baa
Merge jdk8u302-b05
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -1326,3 +1326,4 @@
945bac034e46bbfe1c8d835dbefcf9c030204341 aarch64-shenandoah-jdk8u302-b03-shenandoah-merge-2021-06-23
6a07e2cb5bdb7a4983ee89e7ed715435c722d9b3 jdk8u302-b04
a6d54e1f057bad3d85916f85bdebae60da679007 aarch64-shenandoah-jdk8u302-b04
+d727e88aa12a29c4a217d774d72cbfeb48648f09 jdk8u302-b05
diff --git a/make/lib/SecurityLibraries.gmk b/make/lib/SecurityLibraries.gmk
--- a/make/lib/SecurityLibraries.gmk
+++ b/make/lib/SecurityLibraries.gmk
@@ -133,6 +133,8 @@
endif
ifneq ($(BUILD_LIBKRB5_NAME), )
+ # libosxkrb5 needs to call deprecated krb5 APIs so that java
+ # can use the native credentials cache.
$(eval $(call SetupNativeCompilation,BUILD_LIBKRB5, \
LIBRARY := $(BUILD_LIBKRB5_NAME), \
OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
diff --git a/make/lib/ServiceabilityLibraries.gmk b/make/lib/ServiceabilityLibraries.gmk
--- a/make/lib/ServiceabilityLibraries.gmk
+++ b/make/lib/ServiceabilityLibraries.gmk
@@ -53,7 +53,7 @@
EXCLUDE_FILES := $(LIBATTACH_EXCLUDE_FILES), \
LANG := C, \
OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB), \
+ CFLAGS := $(CFLAGS_JDKLIB) $(CFLAGS_WARNINGS_ARE_ERRORS), \
CFLAGS_windows := /Gy, \
MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libattach/mapfile-$(OPENJDK_TARGET_OS), \
VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
@@ -83,7 +83,7 @@
$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/transport/socket, \
LANG := C, \
OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB) -DUSE_MMAP \
+ CFLAGS := $(CFLAGS_JDKLIB) $(CFLAGS_WARNINGS_ARE_ERRORS) -DUSE_MMAP \
-I$(INCLUDEDIR) -I$(JDK_OUTPUTDIR)/include/$(OPENJDK_TARGET_OS) \
-I$(JDK_TOPDIR)/src/share/transport/socket \
-I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/transport/socket \
@@ -119,7 +119,7 @@
$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/transport/shmem, \
LANG := C, \
OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB) -DUSE_MMAP \
+ CFLAGS := $(CFLAGS_JDKLIB) $(CFLAGS_WARNINGS_ARE_ERRORS) -DUSE_MMAP \
-I$(INCLUDEDIR) -I$(JDK_OUTPUTDIR)/include/$(OPENJDK_TARGET_OS) \
-I$(JDK_TOPDIR)/src/share/transport/shmem \
-I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/transport/shmem \
@@ -148,7 +148,7 @@
SRC := $(JDK_TOPDIR)/src/share/back $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/back, \
LANG := C, \
OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB) -DJDWP_LOGGING \
+ CFLAGS := $(CFLAGS_JDKLIB) $(CFLAGS_WARNINGS_ARE_ERRORS) -DJDWP_LOGGING \
-I$(JDK_TOPDIR)/src/share/transport/export \
-I$(JDK_TOPDIR)/src/share/back/export \
-I$(JDK_TOPDIR)/src/share/npt \
@@ -183,7 +183,7 @@
$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/tracing/dtrace, \
LANG := C, \
OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB) \
+ CFLAGS := $(CFLAGS_JDKLIB) $(CFLAGS_WARNINGS_ARE_ERRORS) \
-I$(JDK_TOPDIR)/src/share/native/sun/tracing/dtrace, \
MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjsdt/mapfile-vers, \
LDFLAGS := $(LDFLAGS_JDKLIB) \
@@ -252,7 +252,7 @@
INCLUDE_FILES := $(LIBINSTRUMENT_FILES), \
LANG := C, \
OPTIMIZATION := LOW, \
- CFLAGS := $(LIBINSTRUMENT_CFLAGS), \
+ CFLAGS := $(LIBINSTRUMENT_CFLAGS) $(CFLAGS_WARNINGS_ARE_ERRORS), \
CFLAGS_debug := -DJPLIS_LOGGING, \
CFLAGS_release := -DNO_JPLIS_LOGGING, \
MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libinstrument/mapfile-vers, \
@@ -327,7 +327,7 @@
EXCLUDE_FILES := $(BUILD_LIBMANAGEMENT_EXCLUDES), \
LANG := C, \
OPTIMIZATION := $(LIBMANAGEMENT_OPTIMIZATION), \
- CFLAGS := $(CFLAGS_JDKLIB) $(BUILD_LIBMANAGEMENT_CFLAGS), \
+ CFLAGS := $(CFLAGS_JDKLIB) $(CFLAGS_WARNINGS_ARE_ERRORS) $(BUILD_LIBMANAGEMENT_CFLAGS), \
MAPFILE := $(LIBMANAGEMENT_MAPFILE), \
LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN), \
@@ -375,7 +375,7 @@
SRC := $(BUILD_LIBHPROF_SRC), \
LANG := C, \
OPTIMIZATION := $(LIBHPROF_OPTIMIZATION), \
- CFLAGS := $(CFLAGS_JDKLIB) \
+ CFLAGS := $(CFLAGS_JDKLIB) $(CFLAGS_WARNINGS_ARE_ERRORS) \
$(BUILD_LIBHPROF_CFLAGS), \
CFLAGS_debug := -DHPROF_LOGGING, \
MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libhprof/mapfile-vers, \
@@ -403,7 +403,7 @@
SRC := $(JDK_TOPDIR)/src/share/demo/jvmti/java_crw_demo, \
LANG := C, \
OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB) \
+ CFLAGS := $(CFLAGS_JDKLIB) $(CFLAGS_WARNINGS_ARE_ERRORS) \
-I$(JDK_TOPDIR)/src/share/demo/jvmti/java_crw_demo, \
MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjava_crw_demo/mapfile-vers, \
LDFLAGS := $(LDFLAGS_JDKLIB) \
@@ -430,7 +430,7 @@
SRC := $(JDK_TOPDIR)/src/closed/share/native/oracle/jfr, \
LANG := C, \
OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB) \
+ CFLAGS := $(CFLAGS_JDKLIB) $(CFLAGS_WARNINGS_ARE_ERRORS) \
-I$(JDK_TOPDIR)/src/closed/share/javavm/export, \
MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjfr/mapfile-vers, \
LDFLAGS := $(LDFLAGS_JDKLIB) \
diff --git a/src/macosx/native/sun/osxapp/ThreadUtilities.m b/src/macosx/native/sun/osxapp/ThreadUtilities.m
--- a/src/macosx/native/sun/osxapp/ThreadUtilities.m
+++ b/src/macosx/native/sun/osxapp/ThreadUtilities.m
@@ -36,7 +36,7 @@
static jobject appkitThreadGroup = NULL;
static BOOL awtEmbedded = NO;
-inline void attachCurrentThread(void** env) {
+static inline void attachCurrentThread(void** env) {
if ([NSThread isMainThread]) {
JavaVMAttachArgs args;
args.version = JNI_VERSION_1_4;
diff --git a/src/share/back/SDE.c b/src/share/back/SDE.c
--- a/src/share/back/SDE.c
+++ b/src/share/back/SDE.c
@@ -48,8 +48,6 @@
#define BASE_STRATUM_NAME "Java"
#define null NULL
-#define true JNI_TRUE
-#define false JNI_FALSE
#define String char *
#define private static
@@ -147,7 +145,7 @@
defaultStratumId = null;
defaultStratumIndex = -1;
baseStratumIndex = -2; /* so as not to match -1 above */
- sourceMapIsValid = false;
+ sourceMapIsValid = JNI_FALSE;
if (getSourceDebugExtension(clazz, &sourceDebugExtension) ==
JVMTI_ERROR_NONE) {
@@ -667,7 +665,7 @@
jplsFilename = readLine();
defaultStratumId = readLine();
createJavaStratum();
- while (true) {
+ while (1) {
if (sdeRead() != '*') {
syntax("expected '*'");
}
@@ -684,7 +682,7 @@
case 'E':
/* set end points */
storeStratum("*terminator*");
- sourceMapIsValid = true;
+ sourceMapIsValid = JNI_TRUE;
return;
default:
ignoreSection();
diff --git a/src/share/back/eventHandler.c b/src/share/back/eventHandler.c
--- a/src/share/back/eventHandler.c
+++ b/src/share/back/eventHandler.c
@@ -1685,7 +1685,7 @@
eventHandler_createPermanentInternal(EventIndex ei, HandlerFunction func)
{
return createInternal(ei, func, NULL,
- NULL, NULL, (jlocation)NULL, JNI_TRUE);
+ NULL, NULL, 0, JNI_TRUE);
}
HandlerNode *
@@ -1694,7 +1694,7 @@
jthread thread)
{
return createInternal(ei, func, thread,
- NULL, NULL, (jlocation)NULL, JNI_FALSE);
+ NULL, NULL, 0, JNI_FALSE);
}
HandlerNode *
diff --git a/src/share/back/log_messages.c b/src/share/back/log_messages.c
--- a/src/share/back/log_messages.c
+++ b/src/share/back/log_messages.c
@@ -56,17 +56,24 @@
static void
get_time_stamp(char *tbuf, size_t ltbuf)
{
- char format[MAXLEN_TIMESTAMP+1];
+ char timestamp_prefix[MAXLEN_TIMESTAMP+1];
+ char timestamp_postfix[MAXLEN_TIMESTAMP+1];
unsigned millisecs = 0;
time_t t = 0;
GETMILLSECS(millisecs);
- if ( time(&t) == (time_t)(-1) )
+ if ( time(&t) == (time_t)(-1) ) {
t = 0;
- (void)strftime(format, sizeof(format),
- /* Break this string up for SCCS's sake */
- "%" "d.%" "m.%" "Y %" "T.%%.3d %" "Z", localtime(&t));
- (void)snprintf(tbuf, ltbuf, format, (int)(millisecs));
+ }
+ /* Break this up so that the format strings are string literals
+ and we avoid a compiler warning. */
+ (void)strftime(timestamp_prefix, sizeof(timestamp_prefix),
+ "%d.%m.%Y %T", localtime(&t));
+ (void)strftime(timestamp_postfix, sizeof(timestamp_postfix),
+ "%Z", localtime(&t));
+ (void)snprintf(tbuf, ltbuf,
+ "%s.%.3d %s", timestamp_prefix,
+ (int)(millisecs), timestamp_postfix);
}
/* Get basename of filename */
@@ -175,7 +182,7 @@
"LOC=%s;PID=%d;THR=t@%d",
location_stamp,
(int)processPid,
- (int)tid);
+ (int)(intptr_t)tid);
/* Construct message string. */
va_start(ap, format);
diff --git a/src/share/classes/jdk/jfr/internal/JVM.java b/src/share/classes/jdk/jfr/internal/JVM.java
--- a/src/share/classes/jdk/jfr/internal/JVM.java
+++ b/src/share/classes/jdk/jfr/internal/JVM.java
@@ -177,6 +177,14 @@
*/
public static native void log(int tagSetId, int level, String message);
+ /**
+ * Check whether the logger would output on the given level
+ *
+ * @param level on level
+ * @return {@literal true} if the logger would output on the given level
+ */
+ public static native boolean shouldLog(int level);
+
/**
* Subscribe to LogLevel updates for LogTag
*
@@ -524,4 +532,4 @@
* @return if it is time to perform a chunk rotation
*/
public native boolean shouldRotateDisk();
-}
+}
\ No newline at end of file
diff --git a/src/share/classes/jdk/jfr/internal/Logger.java b/src/share/classes/jdk/jfr/internal/Logger.java
--- a/src/share/classes/jdk/jfr/internal/Logger.java
+++ b/src/share/classes/jdk/jfr/internal/Logger.java
@@ -62,8 +62,6 @@
}
public static boolean shouldLog(LogTag tag, LogLevel level) {
- // Logging level is not initialized because of lack of Xlog support in jdk8,
- // so this method returns true directly now.
- return true; // TODO: level.level >= tag.tagSetLevel;
+ return JVM.shouldLog(level.level);
}
}
diff --git a/src/share/classes/jdk/jfr/internal/RequestEngine.java b/src/share/classes/jdk/jfr/internal/RequestEngine.java
--- a/src/share/classes/jdk/jfr/internal/RequestEngine.java
+++ b/src/share/classes/jdk/jfr/internal/RequestEngine.java
@@ -67,7 +67,9 @@
} else {
jvm.emitEvent(type.getId(), JVM.counterTime(), 0);
}
- Logger.log(LogTag.JFR_SYSTEM_EVENT, LogLevel.DEBUG, ()-> "Executed periodic hook for " + type.getLogName());
+ if (Logger.shouldLog(LogTag.JFR_EVENT, LogLevel.DEBUG)) {
+ Logger.log(LogTag.JFR_SYSTEM_EVENT, LogLevel.DEBUG, ()-> "Executed periodic hook for " + type.getLogName());
+ }
} else {
executeSecure();
}
@@ -83,7 +85,9 @@
public Void run() {
try {
hook.run();
- Logger.log(LogTag.JFR_EVENT, LogLevel.DEBUG, ()-> "Executed periodic hook for " + type.getLogName());
+ if (Logger.shouldLog(LogTag.JFR_EVENT, LogLevel.DEBUG)) {
+ Logger.log(LogTag.JFR_EVENT, LogLevel.DEBUG, ()-> "Executed periodic hook for " + type.getLogName());
+ }
} catch (Throwable t) {
// Prevent malicious user to propagate exception callback in the wrong context
Logger.log(LogTag.JFR_EVENT, LogLevel.WARN, "Exception occured during execution of period hook for " + type.getLogName());
diff --git a/src/share/classes/sun/security/pkcs11/Secmod.java b/src/share/classes/sun/security/pkcs11/Secmod.java
--- a/src/share/classes/sun/security/pkcs11/Secmod.java
+++ b/src/share/classes/sun/security/pkcs11/Secmod.java
@@ -73,6 +73,15 @@
private final static String TRUST_LIB_NAME = "nssckbi";
+ // Slot IDs - defined in j2secmod.h on the native side
+ // Values obtained from NSS's pkcs11i.h header
+
+ private final static int NETSCAPE_SLOT_ID = 0x1;
+
+ private final static int PRIVATE_KEY_SLOT_ID = 0x2;
+
+ private final static int FIPS_SLOT_ID = 0x3;
+
// handle to be passed to the native code, 0 means not initialized
private long nssHandle;
@@ -392,20 +401,21 @@
private Map<Bytes,TrustAttributes> trust;
Module(String libraryDir, String libraryName, String commonName,
- boolean fips, int slot) {
+ int slotIndex, int slotId) {
ModuleType type;
if ((libraryName == null) || (libraryName.length() == 0)) {
// must be softtoken
libraryName = System.mapLibraryName(SOFTTOKEN_LIB_NAME);
- if (fips == false) {
- type = (slot == 0) ? ModuleType.CRYPTO : ModuleType.KEYSTORE;
- } else {
+ if (slotId == NETSCAPE_SLOT_ID) {
+ type = ModuleType.CRYPTO;
+ } else if (slotId == PRIVATE_KEY_SLOT_ID) {
+ type = ModuleType.KEYSTORE;
+ } else if (slotId == FIPS_SLOT_ID) {
type = ModuleType.FIPS;
- if (slot != 0) {
- throw new RuntimeException
- ("Slot index should be 0 for FIPS slot");
- }
+ } else {
+ throw new RuntimeException("Unexpected slot ID " + slotId +
+ " in the NSS Internal Module");
}
} else {
if (libraryName.endsWith(System.mapLibraryName(TRUST_LIB_NAME))
@@ -426,7 +436,7 @@
}
this.libraryName = libraryFile.getPath();
this.commonName = commonName;
- this.slot = slot;
+ this.slot = slotIndex;
this.type = type;
initConfiguration();
}
diff --git a/src/share/classes/sun/security/pkcs12/PKCS12KeyStore.java b/src/share/classes/sun/security/pkcs12/PKCS12KeyStore.java
--- a/src/share/classes/sun/security/pkcs12/PKCS12KeyStore.java
+++ b/src/share/classes/sun/security/pkcs12/PKCS12KeyStore.java
@@ -272,6 +272,28 @@
}
/**
+ * Retries an action with password "\0" if "" fails.
+ * @param <T> the return type
+ */
+ @FunctionalInterface
+ private interface RetryWithZero<T> {
+
+ T tryOnce(char[] password) throws Exception;
+
+ static <S> S run(RetryWithZero<S> f, char[] password) throws Exception {
+ try {
+ return f.tryOnce(password);
+ } catch (Exception e) {
+ if (password.length == 0) {
+ // Retry using an empty password with a NUL terminator.
+ return f.tryOnce(new char[1]);
+ }
+ throw e;
+ }
+ }
+ }
+
+ /**
* Private keys and certificates are stored in a map.
* Map entries are keyed by alias names.
*/
@@ -360,26 +382,14 @@
}
}
- byte[] keyInfo;
- while (true) {
- try {
- // Use JCE
- SecretKey skey = getPBEKey(password);
- Cipher cipher = Cipher.getInstance(
+ byte[] keyInfo = RetryWithZero.run(pass -> {
+ // Use JCE
+ SecretKey skey = getPBEKey(pass);
+ Cipher cipher = Cipher.getInstance(
mapPBEParamsToAlgorithm(algOid, algParams));
- cipher.init(Cipher.DECRYPT_MODE, skey, algParams);
- keyInfo = cipher.doFinal(encryptedKey);
- break;
- } catch (Exception e) {
- if (password.length == 0) {
- // Retry using an empty password
- // without a NULL terminator.
- password = new char[1];
- continue;
- }
- throw e;
- }
- }
+ cipher.init(Cipher.DECRYPT_MODE, skey, algParams);
+ return cipher.doFinal(encryptedKey);
+ }, password);
/*
* Parse the key algorithm and then use a JCA key factory
@@ -2050,25 +2060,19 @@
" iterations: " + ic + ")");
}
- while (true) {
- try {
+ byte[] rawData = safeContentsData;
+ try {
+ safeContentsData = RetryWithZero.run(pass -> {
// Use JCE
- SecretKey skey = getPBEKey(password);
+ SecretKey skey = getPBEKey(pass);
Cipher cipher = Cipher.getInstance(algOid.toString());
cipher.init(Cipher.DECRYPT_MODE, skey, algParams);
- safeContentsData = cipher.doFinal(safeContentsData);
- break;
- } catch (Exception e) {
- if (password.length == 0) {
- // Retry using an empty password
- // without a NULL terminator.
- password = new char[1];
- continue;
- }
- throw new IOException("keystore password was incorrect",
+ return cipher.doFinal(rawData);
+ }, password);
+ } catch (Exception e) {
+ throw new IOException("keystore password was incorrect",
new UnrecoverableKeyException(
- "failed to decrypt safe contents entry: " + e));
- }
+ "failed to decrypt safe contents entry: " + e));
}
} else {
throw new IOException("public key protected PKCS12" +
@@ -2099,20 +2103,24 @@
Mac m = Mac.getInstance("HmacPBE" + algName);
PBEParameterSpec params =
new PBEParameterSpec(macData.getSalt(), ic);
- SecretKey key = getPBEKey(password);
- m.init(key, params);
- m.update(authSafeData);
- byte[] macResult = m.doFinal();
+
+ RetryWithZero.run(pass -> {
+ SecretKey key = getPBEKey(pass);
+ m.init(key, params);
+ m.update(authSafeData);
+ byte[] macResult = m.doFinal();
- if (debug != null) {
- debug.println("Checking keystore integrity " +
- "(" + m.getAlgorithm() + " iterations: " + ic + ")");
- }
+ if (debug != null) {
+ debug.println("Checking keystore integrity " +
+ "(" + m.getAlgorithm() + " iterations: " + ic + ")");
+ }
- if (!MessageDigest.isEqual(macData.getDigest(), macResult)) {
- throw new UnrecoverableKeyException("Failed PKCS12" +
- " integrity checking");
- }
+ if (!MessageDigest.isEqual(macData.getDigest(), macResult)) {
+ throw new UnrecoverableKeyException("Failed PKCS12" +
+ " integrity checking");
+ }
+ return (Void)null;
+ }, password);
} catch (Exception e) {
throw new IOException("Integrity check failed: " + e, e);
}
diff --git a/src/share/classes/sun/security/ssl/AlpnExtension.java b/src/share/classes/sun/security/ssl/AlpnExtension.java
--- a/src/share/classes/sun/security/ssl/AlpnExtension.java
+++ b/src/share/classes/sun/security/ssl/AlpnExtension.java
@@ -27,7 +27,10 @@
import java.io.IOException;
import java.nio.ByteBuffer;
-import java.nio.charset.StandardCharsets;
+import java.nio.charset.Charset;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.security.Security;
import java.util.Arrays;
import java.util.Collections;
import java.util.LinkedList;
@@ -59,6 +62,20 @@
static final SSLStringizer alpnStringizer = new AlpnStringizer();
+ // Encoding Charset to convert between String and byte[]
+ static final Charset alpnCharset;
+
+ static {
+ String alpnCharsetString = AccessController.doPrivileged(
+ (PrivilegedAction<String>) ()
+ -> Security.getProperty("jdk.tls.alpnCharset"));
+ if ((alpnCharsetString == null)
+ || (alpnCharsetString.length() == 0)) {
+ alpnCharsetString = "ISO_8859_1";
+ }
+ alpnCharset = Charset.forName(alpnCharsetString);
+ }
+
/**
* The "application_layer_protocol_negotiation" extension.
*
@@ -97,7 +114,7 @@
"extension: empty application protocol name");
}
- String appProtocol = new String(bytes, StandardCharsets.UTF_8);
+ String appProtocol = new String(bytes, alpnCharset);
protocolNames.add(appProtocol);
}
@@ -164,10 +181,10 @@
return null;
}
- // Produce the extension.
+ // Produce the extension: first find the overall length
int listLength = 0; // ProtocolNameList length
for (String ap : laps) {
- int length = ap.getBytes(StandardCharsets.UTF_8).length;
+ int length = ap.getBytes(alpnCharset).length;
if (length == 0) {
// log the configuration problem
if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
@@ -219,8 +236,10 @@
byte[] extData = new byte[listLength + 2];
ByteBuffer m = ByteBuffer.wrap(extData);
Record.putInt16(m, listLength);
+
+ // opaque ProtocolName<1..2^8-1>;
for (String ap : laps) {
- Record.putBytes8(m, ap.getBytes(StandardCharsets.UTF_8));
+ Record.putBytes8(m, ap.getBytes(alpnCharset));
}
// Update the context.
@@ -415,14 +434,14 @@
}
// opaque ProtocolName<1..2^8-1>, RFC 7301.
- int listLen = shc.applicationProtocol.length() + 1;
- // 1: length byte
+ byte[] bytes = shc.applicationProtocol.getBytes(alpnCharset);
+ int listLen = bytes.length + 1; // 1: length byte
+
// ProtocolName protocol_name_list<2..2^16-1>, RFC 7301.
byte[] extData = new byte[listLen + 2]; // 2: list length
ByteBuffer m = ByteBuffer.wrap(extData);
Record.putInt16(m, listLen);
- Record.putBytes8(m,
- shc.applicationProtocol.getBytes(StandardCharsets.UTF_8));
+ Record.putBytes8(m, bytes);
// Update the context.
shc.conContext.applicationProtocol = shc.applicationProtocol;
diff --git a/src/share/classes/sun/security/x509/AlgorithmId.java b/src/share/classes/sun/security/x509/AlgorithmId.java
--- a/src/share/classes/sun/security/x509/AlgorithmId.java
+++ b/src/share/classes/sun/security/x509/AlgorithmId.java
@@ -589,6 +589,15 @@
|| name.equalsIgnoreCase("SHA1/RSA")) {
return AlgorithmId.sha1WithRSAEncryption_oid;
}
+ if (name.equalsIgnoreCase("SHA256WithRSA")) {
+ return AlgorithmId.sha256WithRSAEncryption_oid;
+ }
+ if (name.equalsIgnoreCase("SHA384WithRSA")) {
+ return AlgorithmId.sha384WithRSAEncryption_oid;
+ }
+ if (name.equalsIgnoreCase("SHA512WithRSA")) {
+ return AlgorithmId.sha512WithRSAEncryption_oid;
+ }
if (name.equalsIgnoreCase("SHA1withECDSA")
|| name.equalsIgnoreCase("ECDSA")) {
return AlgorithmId.sha1WithECDSA_oid;
diff --git a/src/share/instrument/InvocationAdapter.c b/src/share/instrument/InvocationAdapter.c
--- a/src/share/instrument/InvocationAdapter.c
+++ b/src/share/instrument/InvocationAdapter.c
@@ -373,7 +373,7 @@
* class name. The manifest is in UTF8 so need to convert to
* modified UTF8 (see JNI spec).
*/
- oldLen = strlen(agentClass);
+ oldLen = (int)strlen(agentClass);
newLen = modifiedUtf8LengthOfUtf8(agentClass, oldLen);
/*
* According to JVMS class name is represented as CONSTANT_Utf8_info,
diff --git a/src/share/instrument/PathCharsValidator.c b/src/share/instrument/PathCharsValidator.c
--- a/src/share/instrument/PathCharsValidator.c
+++ b/src/share/instrument/PathCharsValidator.c
@@ -46,9 +46,9 @@
/* Compute the low-order mask for the characters in the given string */
static jlong lowMask(char* s) {
- int n = strlen(s);
+ size_t n = strlen(s);
jlong m = 0;
- int i;
+ size_t i;
for (i = 0; i < n; i++) {
int c = (int)s[i];
if (c < 64)
@@ -59,9 +59,9 @@
/* Compute the high-order mask for the characters in the given string */
static jlong highMask(char* s) {
- int n = strlen(s);
+ size_t n = strlen(s);
jlong m = 0;
- int i;
+ size_t i;
for (i = 0; i < n; i++) {
int c = (int)s[i];
if ((c >= 64) && (c < 128))
@@ -168,7 +168,7 @@
* illegal characters. Returns 0 if only validate characters are present.
*/
int validatePathChars(const char* path) {
- int i, n;
+ size_t i, n;
/* initialize on first usage */
if (L_HEX == 0) {
diff --git a/src/share/lib/security/java.security-aix b/src/share/lib/security/java.security-aix
--- a/src/share/lib/security/java.security-aix
+++ b/src/share/lib/security/java.security-aix
@@ -1193,6 +1193,16 @@
#jdk.security.allowNonCaAnchor=true
#
+# The default Character set name (java.nio.charset.Charset.forName())
+# for converting TLS ALPN values between byte arrays and Strings.
+# Prior versions of the JDK may use UTF-8 as the default charset. If
+# you experience interoperability issues, setting this property to UTF-8
+# may help.
+#
+# jdk.tls.alpnCharset=UTF-8
+jdk.tls.alpnCharset=ISO_8859_1
+
+#
# JNDI Object Factories Filter
#
# This filter is used by the JNDI runtime to control the set of object factory classes
diff --git a/src/share/lib/security/java.security-linux b/src/share/lib/security/java.security-linux
--- a/src/share/lib/security/java.security-linux
+++ b/src/share/lib/security/java.security-linux
@@ -1199,6 +1199,16 @@
#jdk.security.allowNonCaAnchor=true
#
+# The default Character set name (java.nio.charset.Charset.forName())
+# for converting TLS ALPN values between byte arrays and Strings.
+# Prior versions of the JDK may use UTF-8 as the default charset. If
+# you experience interoperability issues, setting this property to UTF-8
+# may help.
+#
+# jdk.tls.alpnCharset=UTF-8
+jdk.tls.alpnCharset=ISO_8859_1
+
+#
# JNDI Object Factories Filter
#
# This filter is used by the JNDI runtime to control the set of object factory classes
diff --git a/src/share/lib/security/java.security-macosx b/src/share/lib/security/java.security-macosx
--- a/src/share/lib/security/java.security-macosx
+++ b/src/share/lib/security/java.security-macosx
@@ -1197,6 +1197,16 @@
#jdk.security.allowNonCaAnchor=true
#
+# The default Character set name (java.nio.charset.Charset.forName())
+# for converting TLS ALPN values between byte arrays and Strings.
+# Prior versions of the JDK may use UTF-8 as the default charset. If
+# you experience interoperability issues, setting this property to UTF-8
+# may help.
+#
+# jdk.tls.alpnCharset=UTF-8
+jdk.tls.alpnCharset=ISO_8859_1
+
+#
# JNDI Object Factories Filter
#
# This filter is used by the JNDI runtime to control the set of object factory classes
diff --git a/src/share/lib/security/java.security-solaris b/src/share/lib/security/java.security-solaris
--- a/src/share/lib/security/java.security-solaris
+++ b/src/share/lib/security/java.security-solaris
@@ -1195,6 +1195,16 @@
#jdk.security.allowNonCaAnchor=true
#
+# The default Character set name (java.nio.charset.Charset.forName())
+# for converting TLS ALPN values between byte arrays and Strings.
+# Prior versions of the JDK may use UTF-8 as the default charset. If
+# you experience interoperability issues, setting this property to UTF-8
+# may help.
+#
+# jdk.tls.alpnCharset=UTF-8
+jdk.tls.alpnCharset=ISO_8859_1
+
+#
# JNDI Object Factories Filter
#
# This filter is used by the JNDI runtime to control the set of object factory classes
diff --git a/src/share/lib/security/java.security-windows b/src/share/lib/security/java.security-windows
--- a/src/share/lib/security/java.security-windows
+++ b/src/share/lib/security/java.security-windows
@@ -1197,6 +1197,16 @@
#jdk.security.allowNonCaAnchor=true
#
+# The default Character set name (java.nio.charset.Charset.forName())
+# for converting TLS ALPN values between byte arrays and Strings.
+# Prior versions of the JDK may use UTF-8 as the default charset. If
+# you experience interoperability issues, setting this property to UTF-8
+# may help.
+#
+# jdk.tls.alpnCharset=UTF-8
+jdk.tls.alpnCharset=ISO_8859_1
+
+#
# JNDI Object Factories Filter
#
# This filter is used by the JNDI runtime to control the set of object factory classes
diff --git a/src/share/native/com/sun/java/util/jar/pack/bands.cpp b/src/share/native/com/sun/java/util/jar/pack/bands.cpp
--- a/src/share/native/com/sun/java/util/jar/pack/bands.cpp
+++ b/src/share/native/com/sun/java/util/jar/pack/bands.cpp
@@ -288,7 +288,7 @@
{ e_##name, #name, /*debug only*/ \
cspec, ix }
-const band_init all_band_inits[] = {
+const band_init all_band_inits[BAND_LIMIT+1] = {
//BAND_INIT(archive_magic, BYTE1_spec, 0),
//BAND_INIT(archive_header, UNSIGNED5_spec, 0),
//BAND_INIT(band_headers, BYTE1_spec, 0),
@@ -448,14 +448,8 @@
BAND_INIT(file_modtime, DELTA5_spec, 0),
BAND_INIT(file_options, UNSIGNED5_spec, 0),
//BAND_INIT(file_bits, BYTE1_spec, 0),
-#ifndef PRODUCT
- { 0, 0, 0, 0 }
-#else
- { 0, 0 }
-#endif
+ { 0, NULL, 0, 0 }
};
-#define NUM_BAND_INITS \
- (sizeof(all_band_inits)/sizeof(all_band_inits[0]))
band* band::makeBands(unpacker* u) {
band* tmp_all_bands = U_NEW(band, BAND_LIMIT);
diff --git a/src/share/native/sun/java2d/opengl/OGLContext.c b/src/share/native/sun/java2d/opengl/OGLContext.c
--- a/src/share/native/sun/java2d/opengl/OGLContext.c
+++ b/src/share/native/sun/java2d/opengl/OGLContext.c
@@ -38,6 +38,8 @@
#include "GraphicsPrimitiveMgr.h"
#include "Region.h"
+#include "jvm.h"
+
/**
* The following methods are implemented in the windowing system (i.e. GLX
* and WGL) source files.
diff --git a/src/share/native/sun/security/jgss/wrapper/GSSLibStub.c b/src/share/native/sun/security/jgss/wrapper/GSSLibStub.c
--- a/src/share/native/sun/security/jgss/wrapper/GSSLibStub.c
+++ b/src/share/native/sun/security/jgss/wrapper/GSSLibStub.c
@@ -430,11 +430,11 @@
checkStatus(env, jobj, major, minor, "[GSSLibStub_canonicalizeName]");
if ((*env)->ExceptionCheck(env)) {
- return (jlong) GSS_C_NO_NAME;
+ return ptr_to_jlong(GSS_C_NO_NAME);
}
return ptr_to_jlong(mnNameHdl);
}
- return (jlong) GSS_C_NO_NAME;
+ return ptr_to_jlong(GSS_C_NO_NAME);
}
/*
diff --git a/src/share/native/sun/security/krb5/nativeccache.c b/src/share/native/sun/security/krb5/nativeccache.c
--- a/src/share/native/sun/security/krb5/nativeccache.c
+++ b/src/share/native/sun/security/krb5/nativeccache.c
@@ -25,6 +25,8 @@
#import "sun_security_krb5_Credentials.h"
#import <Kerberos/Kerberos.h>
+#import <string.h>
+#import <time.h>
/*
* Based largely on klist.c,
diff --git a/src/share/native/sun/security/pkcs11/j2secmod.c b/src/share/native/sun/security/pkcs11/j2secmod.c
--- a/src/share/native/sun/security/pkcs11/j2secmod.c
+++ b/src/share/native/sun/security/pkcs11/j2secmod.c
@@ -153,8 +153,7 @@
jobject jList, jModule;
jmethodID jListConstructor, jAdd, jModuleConstructor;
jstring jCommonName, jDllName;
- jboolean jFIPS;
- jint i;
+ jint i, jSlotID;
if (getModuleList == NULL) {
dprintf("-getmodulelist function not found\n");
@@ -187,7 +186,7 @@
return NULL;
}
jModuleConstructor = (*env)->GetMethodID(env, jModuleClass, "<init>",
- "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZI)V");
+ "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;II)V");
if (jModuleConstructor == NULL) {
return NULL;
}
@@ -213,10 +212,15 @@
return NULL;
}
}
- jFIPS = module->isFIPS;
for (i = 0; i < module->slotCount; i++ ) {
+ jSlotID = module->slots[i]->slotID;
+ if (jDllName == NULL && jSlotID != NETSCAPE_SLOT_ID &&
+ jSlotID != PRIVATE_KEY_SLOT_ID && jSlotID != FIPS_SLOT_ID) {
+ // Ignore unknown slot IDs in the NSS Internal Module. See JDK-8265462.
+ continue;
+ }
jModule = (*env)->NewObject(env, jModuleClass, jModuleConstructor,
- jLibDir, jDllName, jCommonName, jFIPS, i);
+ jLibDir, jDllName, jCommonName, i, jSlotID);
if (jModule == NULL) {
return NULL;
}
diff --git a/src/share/native/sun/security/pkcs11/j2secmod.h b/src/share/native/sun/security/pkcs11/j2secmod.h
--- a/src/share/native/sun/security/pkcs11/j2secmod.h
+++ b/src/share/native/sun/security/pkcs11/j2secmod.h
@@ -51,32 +51,150 @@
// NSS types
typedef int PRBool;
+typedef unsigned short PRUint16;
+typedef short PRInt16;
+typedef unsigned int PRUint32;
+typedef int PRInt32;
+typedef long long PRInt64;
+
+typedef PRUint32 PRIntervalTime;
+typedef PRInt64 PRTime;
+
+typedef struct PK11SlotInfoStr PK11SlotInfo;
typedef struct SECMODModuleStr SECMODModule;
typedef struct SECMODModuleListStr SECMODModuleList;
+// Defined in NSS's secmodt.h header
+/* PKCS #11 disable reasons */
+typedef enum {
+ PK11_DIS_NONE = 0,
+ PK11_DIS_USER_SELECTED = 1,
+ PK11_DIS_COULD_NOT_INIT_TOKEN = 2,
+ PK11_DIS_TOKEN_VERIFY_FAILED = 3,
+ PK11_DIS_TOKEN_NOT_PRESENT = 4
+} PK11DisableReasons;
+
+// Slot IDs - defined in Secmod.java on the Java side
+// Values obtained from NSS's pkcs11i.h header
+#define NETSCAPE_SLOT_ID 1
+#define PRIVATE_KEY_SLOT_ID 2
+#define FIPS_SLOT_ID 3
+
+// Defined in NSS's secmodti.h header
+/* represent a pkcs#11 slot reference counted. */
+struct PK11SlotInfoStr {
+ /* the PKCS11 function list for this slot */
+ void *functionList;
+ SECMODModule *module; /* our parent module */
+ /* Boolean to indicate the current state of this slot */
+ PRBool needTest; /* Has this slot been tested for Export complience */
+ PRBool isPerm; /* is this slot a permanment device */
+ PRBool isHW; /* is this slot a hardware device */
+ PRBool isInternal; /* is this slot one of our internal PKCS #11 devices */
+ PRBool disabled; /* is this slot disabled... */
+ PK11DisableReasons reason; /* Why this slot is disabled */
+ PRBool readOnly; /* is the token in this slot read-only */
+ PRBool needLogin; /* does the token of the type that needs
+ * authentication (still true even if token is logged
+ * in) */
+ PRBool hasRandom; /* can this token generated random numbers */
+ PRBool defRWSession; /* is the default session RW (we open our default
+ * session rw if the token can only handle one session
+ * at a time. */
+ PRBool isThreadSafe; /* copied from the module */
+ /* The actual flags (many of which are distilled into the above PRBools) */
+ CK_FLAGS flags; /* flags from PKCS #11 token Info */
+ /* a default session handle to do quick and dirty functions */
+ CK_SESSION_HANDLE session;
+ void *sessionLock; /* lock for this session */
+ /* our ID */
+ CK_SLOT_ID slotID;
+ /* persistant flags saved from startup to startup */
+ unsigned long defaultFlags;
+ /* keep track of who is using us so we don't accidently get freed while
+ * still in use */
+ PRInt32 refCount; /* to be in/decremented by atomic calls ONLY! */
+ void *freeListLock;
+ void *freeSymKeysWithSessionHead;
+ void *freeSymKeysHead;
+ int keyCount;
+ int maxKeyCount;
+ /* Password control functions for this slot. many of these are only
+ * active if the appropriate flag is on in defaultFlags */
+ int askpw; /* what our password options are */
+ int timeout; /* If we're ask_timeout, what is our timeout time is
+ * seconds */
+ int authTransact; /* allow multiple authentications off one password if
+ * they are all part of the same transaction */
+ PRTime authTime; /* when were we last authenticated */
+ int minPassword; /* smallest legal password */
+ int maxPassword; /* largest legal password */
+ PRUint16 series; /* break up the slot info into various groups of
+ * inserted tokens so that keys and certs can be
+ * invalidated */
+ PRUint16 flagSeries; /* record the last series for the last event
+ * returned for this slot */
+ PRBool flagState; /* record the state of the last event returned for this
+ * slot. */
+ PRUint16 wrapKey; /* current wrapping key for SSL master secrets */
+ CK_MECHANISM_TYPE wrapMechanism;
+ /* current wrapping mechanism for current wrapKey */
+ CK_OBJECT_HANDLE refKeys[1]; /* array of existing wrapping keys for */
+ CK_MECHANISM_TYPE *mechanismList; /* list of mechanism supported by this
+ * token */
+ int mechanismCount;
+ /* cache the certificates stored on the token of this slot */
+ void **cert_array;
+ int array_size;
+ int cert_count;
+ char serial[16];
+ /* since these are odd sizes, keep them last. They are odd sizes to
+ * allow them to become null terminated strings */
+ char slot_name[65];
+ char token_name[33];
+ PRBool hasRootCerts;
+ PRBool hasRootTrust;
+ PRBool hasRSAInfo;
+ CK_FLAGS RSAInfoFlags;
+ PRBool protectedAuthPath;
+ PRBool isActiveCard;
+ PRIntervalTime lastLoginCheck;
+ unsigned int lastState;
+ /* for Stan */
+ void *nssToken;
+ /* the tokeninfo struct */
+ CK_TOKEN_INFO tokenInfo;
+ /* fast mechanism lookup */
+ char mechanismBits[256];
+ CK_PROFILE_ID *profileList;
+ int profileCount;
+};
+
+// Defined in NSS's secmodt.h header
struct SECMODModuleStr {
- void *v1;
- PRBool internal; /* true of internally linked modules, false
- * for the loaded modules */
- PRBool loaded; /* Set to true if module has been loaded */
- PRBool isFIPS; /* Set to true if module is finst internal */
- char *dllName; /* name of the shared library which implements
- * this module */
- char *commonName; /* name of the module to display to the user */
- void *library; /* pointer to the library. opaque. used only by
- * pk11load.c */
+ void *v1;
+ PRBool internal; /* true of internally linked modules, false
+ * for the loaded modules */
+ PRBool loaded; /* Set to true if module has been loaded */
+ PRBool isFIPS; /* Set to true if module is finst internal */
+ char *dllName; /* name of the shared library which implements
+ * this module */
+ char *commonName; /* name of the module to display to the user */
+ void *library; /* pointer to the library. opaque. used only by
+ * pk11load.c */
- void *functionList; /* The PKCS #11 function table */
- void *refLock; /* only used pk11db.c */
- int refCount; /* Module reference count */
- void **slots; /* array of slot points attached to this mod*/
- int slotCount; /* count of slot in above array */
- void *slotInfo; /* special info about slots default settings */
- int slotInfoCount; /* count */
+ void *functionList; /* The PKCS #11 function table */
+ void *refLock; /* only used pk11db.c */
+ int refCount; /* Module reference count */
+ PK11SlotInfo **slots; /* array of slot points attached to this mod*/
+ int slotCount; /* count of slot in above array */
+ void *slotInfo; /* special info about slots default settings */
+ int slotInfoCount; /* count */
// incomplete, sizeof() is wrong
};
+// Defined in NSS's secmodt.h header
struct SECMODModuleListStr {
SECMODModuleList *next;
SECMODModule *module;
diff --git a/src/share/native/sun/security/pkcs11/wrapper/pkcs11t.h b/src/share/native/sun/security/pkcs11/wrapper/pkcs11t.h
--- a/src/share/native/sun/security/pkcs11/wrapper/pkcs11t.h
+++ b/src/share/native/sun/security/pkcs11/wrapper/pkcs11t.h
@@ -1998,5 +1998,7 @@
typedef CK_SEED_CBC_ENCRYPT_DATA_PARAMS CK_PTR \
CK_SEED_CBC_ENCRYPT_DATA_PARAMS_PTR;
+typedef CK_ULONG CK_PROFILE_ID;
+
#endif /* _PKCS11T_H_ */
diff --git a/src/solaris/back/util_md.h b/src/solaris/back/util_md.h
--- a/src/solaris/back/util_md.h
+++ b/src/solaris/back/util_md.h
@@ -62,13 +62,13 @@
(((UNSIGNED_JINT)(x & 0xff000000)) >> 24))
#define HOST_TO_JAVA_LONG(x) \
((x << 56) | \
- ((x & 0x000000000000ff00) << 40) | \
- ((x & 0x0000000000ff0000) << 24) | \
- ((x & 0x00000000ff000000) << 8) | \
- ((x & 0x000000ff00000000) >> 8) | \
- ((x & 0x0000ff0000000000) >> 24) | \
- ((x & 0x00ff000000000000) >> 40) | \
- (((UNSIGNED_JLONG)(x & 0xff00000000000000)) >> 56))
+ ((x & 0x000000000000ff00LL) << 40) | \
+ ((x & 0x0000000000ff0000LL) << 24) | \
+ ((x & 0x00000000ff000000LL) << 8) | \
+ ((x & 0x000000ff00000000LL) >> 8) | \
+ ((x & 0x0000ff0000000000LL) >> 24) | \
+ ((x & 0x00ff000000000000LL) >> 40) | \
+ (((UNSIGNED_JLONG)(x & 0xff00000000000000ULL)) >> 56))
#define HOST_TO_JAVA_FLOAT(x) stream_encodeFloat(x)
#define HOST_TO_JAVA_DOUBLE(x) stream_encodeDouble(x)
diff --git a/src/solaris/native/sun/awt/awt_Font.c b/src/solaris/native/sun/awt/awt_Font.c
--- a/src/solaris/native/sun/awt/awt_Font.c
+++ b/src/solaris/native/sun/awt/awt_Font.c
@@ -454,6 +454,7 @@
int32_t i, size;
char *fontsetname = NULL;
char *nativename = NULL;
+ Boolean doFree = FALSE;
jobjectArray componentFonts = NULL;
jobject peer = NULL;
jobject fontDescriptor = NULL;
@@ -493,8 +494,10 @@
if (!JNU_IsNull(env, fontDescriptorName)) {
nativename = (char *) JNU_GetStringPlatformChars(env, fontDescriptorName, NULL);
+ doFree = TRUE;
} else {
nativename = "";
+ doFree = FALSE;
}
fdata->flist[i].xlfd = malloc(strlen(nativename)
@@ -502,7 +505,7 @@
jio_snprintf(fdata->flist[i].xlfd, strlen(nativename) + 10,
nativename, size * 10);
- if (nativename != NULL && nativename != "")
+ if (nativename != NULL && doFree)
JNU_ReleaseStringPlatformChars(env, fontDescriptorName, (const char *) nativename);
/*
diff --git a/src/solaris/native/sun/java2d/x11/X11SurfaceData.c b/src/solaris/native/sun/java2d/x11/X11SurfaceData.c
--- a/src/solaris/native/sun/java2d/x11/X11SurfaceData.c
+++ b/src/solaris/native/sun/java2d/x11/X11SurfaceData.c
@@ -545,7 +545,7 @@
xsdo->cData = xsdo->configData->color_data;
XShared_initSurface(env, xsdo, depth, width, height, drawable);
- xsdo->xrPic = NULL;
+ xsdo->xrPic = None;
#endif /* !HEADLESS */
}
diff --git a/src/solaris/native/sun/management/MacosxOperatingSystem.c b/src/solaris/native/sun/management/MacosxOperatingSystem.c
--- a/src/solaris/native/sun/management/MacosxOperatingSystem.c
+++ b/src/solaris/native/sun/management/MacosxOperatingSystem.c
@@ -29,6 +29,7 @@
#include <mach/mach.h>
#include <mach/task_info.h>
+#include "jvm.h"
JNIEXPORT jdouble JNICALL
Java_sun_management_OperatingSystemImpl_getSystemCpuLoad0
diff --git a/src/solaris/native/sun/xawt/XToolkit.c b/src/solaris/native/sun/xawt/XToolkit.c
--- a/src/solaris/native/sun/xawt/XToolkit.c
+++ b/src/solaris/native/sun/xawt/XToolkit.c
@@ -716,7 +716,7 @@
if (pollFds[0].revents) {
// Events in X pipe
update_poll_timeout(TIMEOUT_EVENTS);
- PRINT2("performPoll(): TIMEOUT_EVENTS curPollTimeout = %ld \n", curPollTimeout);
+ PRINT2("performPoll(): TIMEOUT_EVENTS curPollTimeout = %d \n", curPollTimeout);
}
return TRUE;
diff --git a/src/windows/back/linker_md.c b/src/windows/back/linker_md.c
--- a/src/windows/back/linker_md.c
+++ b/src/windows/back/linker_md.c
@@ -33,6 +33,7 @@
#include <string.h>
#include <errno.h>
#include <io.h>
+#include <stdlib.h>
#include "sys.h"
diff --git a/src/windows/back/proc_md.h b/src/windows/back/proc_md.h
--- a/src/windows/back/proc_md.h
+++ b/src/windows/back/proc_md.h
@@ -27,6 +27,7 @@
#include <process.h>
#include <time.h>
+#include <Windows.h>
#define MUTEX_T int
#define MUTEX_INIT 0
@@ -40,4 +41,4 @@
#define popen _popen
#define pclose _pclose
-#define sleep _sleep
+#define sleep(s) Sleep((s)*1000)
diff --git a/test/com/sun/jdi/ShellScaffold.sh b/test/com/sun/jdi/ShellScaffold.sh
--- a/test/com/sun/jdi/ShellScaffold.sh
+++ b/test/com/sun/jdi/ShellScaffold.sh
@@ -1,7 +1,7 @@
#!/bin/sh
#
-# Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 2017, 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
@@ -267,10 +267,10 @@
# treat them as control chars on mks (eg \t is tab)
# Oops; windows mks really seems to want this cat line
# to start in column 1
- if [ -w "$SystemRoot" ] ; then
- tmpFile=$SystemRoot/tmp.$$
- elif [ -w "$SYSTEMROOT" ] ; then
- tmpFile=$SYSTEMROOT/tmp.$$
+ if [ -w "$Temp" ] ; then
+ tmpFile=$Temp/tmp.$$
+ elif [ -w "$TEMP" ] ; then
+ tmpFile=$TEMP/tmp.$$
else
tmpFile=tmp.$$
fi
diff --git a/test/java/awt/EventDispatchThread/HandleExceptionOnEDT/HandleExceptionOnEDT.java b/test/java/awt/EventDispatchThread/HandleExceptionOnEDT/HandleExceptionOnEDT.java
--- a/test/java/awt/EventDispatchThread/HandleExceptionOnEDT/HandleExceptionOnEDT.java
+++ b/test/java/awt/EventDispatchThread/HandleExceptionOnEDT/HandleExceptionOnEDT.java
@@ -89,9 +89,9 @@
Point fp = f.getLocationOnScreen();
r.mouseMove(fp.x + f.getWidth() / 2, fp.y + f.getHeight() / 2);
Util.waitForIdle(r);
- r.mousePress(InputEvent.BUTTON1_MASK);
+ r.mousePress(InputEvent.BUTTON1_DOWN_MASK);
Util.waitForIdle(r);
- r.mouseRelease(InputEvent.BUTTON2_MASK);
+ r.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
f.removeMouseListener(exceptionListener);
if (!exceptionHandled)
@@ -117,9 +117,9 @@
Point dp = d.getLocationOnScreen();
r.mouseMove(dp.x + d.getWidth() / 2, dp.y + d.getHeight() / 2);
Util.waitForIdle(r);
- r.mousePress(InputEvent.BUTTON1_MASK);
+ r.mousePress(InputEvent.BUTTON1_DOWN_MASK);
Util.waitForIdle(r);
- r.mouseRelease(InputEvent.BUTTON2_MASK);
+ r.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
d.removeMouseListener(exceptionListener);
if (!exceptionHandled)
@@ -141,9 +141,9 @@
mousePressed = false;
r.mouseMove(fp.x + 50, fp.y + 50);
Util.waitForIdle(r);
- r.mousePress(InputEvent.BUTTON1_MASK);
+ r.mousePress(InputEvent.BUTTON1_DOWN_MASK);
Util.waitForIdle(r);
- r.mouseRelease(InputEvent.BUTTON1_MASK);
+ r.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
Util.waitForIdle(r);
f.removeMouseListener(pressedListener);
diff --git a/test/java/awt/FontClass/CreateFont/DeleteFont.java b/test/java/awt/FontClass/CreateFont/DeleteFont.java
--- a/test/java/awt/FontClass/CreateFont/DeleteFont.java
+++ b/test/java/awt/FontClass/CreateFont/DeleteFont.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2020, 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
@@ -21,8 +21,11 @@
* questions.
*/
-import java.io.*;
-import java.awt.*;
+import java.io.ByteArrayInputStream;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.io.IOException;
+import java.awt.Font;
public class DeleteFont {
@@ -55,19 +58,22 @@
if (!gotException) {
throw new RuntimeException("No expected IOException");
}
- badRead(-2, Font.TRUETYPE_FONT);
- badRead(8193, Font.TRUETYPE_FONT);
- badRead(-2, Font.TYPE1_FONT);
- badRead(8193, Font.TYPE1_FONT);
+ badRead(-2, 16, Font.TYPE1_FONT);
+ badRead(8193, 14, Font.TYPE1_FONT);
+
+ badRead(-2, 12, Font.TRUETYPE_FONT);
+ badRead(8193, 10, Font.TRUETYPE_FONT);
// Make sure GC has a chance to clean up before we exit.
System.gc(); System.gc();
+ Thread.sleep(5000);
+ System.gc(); System.gc();
}
- static void badRead(final int retval, int fontType) {
+ static void badRead(final int retval, final int multiple, int fontType) {
int num = 2;
- byte[] buff = new byte[16*8192]; // Multiple of 8192 is important.
+ byte[] buff = new byte[multiple*8192]; // Multiple of 8192 is important.
for (int ct=0; ct<num; ++ct) {
try {
Font.createFont(
diff --git a/test/java/awt/FontClass/CreateFont/DeleteFont.sh b/test/java/awt/FontClass/CreateFont/DeleteFont.sh
--- a/test/java/awt/FontClass/CreateFont/DeleteFont.sh
+++ b/test/java/awt/FontClass/CreateFont/DeleteFont.sh
@@ -20,7 +20,8 @@
# questions.
# @test
-# @bug 6189812 6380357 6632886
+# @bug 6189812 6380357 6632886 8249142
+# @key intermittent
# @summary Verify that temporary font files are deleted on exit.
if [ -z "${TESTSRC}" ]; then
diff --git a/test/java/rmi/activation/Activatable/checkActivateRef/CheckActivateRef.java b/test/java/rmi/activation/Activatable/checkActivateRef/CheckActivateRef.java
--- a/test/java/rmi/activation/Activatable/checkActivateRef/CheckActivateRef.java
+++ b/test/java/rmi/activation/Activatable/checkActivateRef/CheckActivateRef.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2012, 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
@@ -262,7 +262,7 @@
e.getClass().getName(), e);
} finally {
- ActivationLibrary.rmidCleanup(rmid);
+ rmid.cleanup();
obj = null;
}
}
diff --git a/test/java/rmi/activation/Activatable/checkAnnotations/CheckAnnotations.java b/test/java/rmi/activation/Activatable/checkAnnotations/CheckAnnotations.java
--- a/test/java/rmi/activation/Activatable/checkAnnotations/CheckAnnotations.java
+++ b/test/java/rmi/activation/Activatable/checkAnnotations/CheckAnnotations.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2012, 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
@@ -130,7 +130,7 @@
myRMI = null;
System.err.println("rmid shut down");
- ActivationLibrary.rmidCleanup(rmid);
+ rmid.cleanup();
}
}
diff --git a/test/java/rmi/activation/Activatable/checkImplClassLoader/CheckImplClassLoader.java b/test/java/rmi/activation/Activatable/checkImplClassLoader/CheckImplClassLoader.java
--- a/test/java/rmi/activation/Activatable/checkImplClassLoader/CheckImplClassLoader.java
+++ b/test/java/rmi/activation/Activatable/checkImplClassLoader/CheckImplClassLoader.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -112,7 +112,7 @@
myRMI = null;
System.err.println("rmid shut down");
- ActivationLibrary.rmidCleanup(rmid);
+ rmid.cleanup();
TestLibrary.unexport(group);
}
}
diff --git a/test/java/rmi/activation/Activatable/checkRegisterInLog/CheckRegisterInLog.java b/test/java/rmi/activation/Activatable/checkRegisterInLog/CheckRegisterInLog.java
--- a/test/java/rmi/activation/Activatable/checkRegisterInLog/CheckRegisterInLog.java
+++ b/test/java/rmi/activation/Activatable/checkRegisterInLog/CheckRegisterInLog.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2012, 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
@@ -164,7 +164,7 @@
throw new RuntimeException("CheckRegisterInLog got exception " +
e.getMessage());
} finally {
- ActivationLibrary.rmidCleanup(rmid);
+ rmid.cleanup();
}
}
}
diff --git a/test/java/rmi/activation/Activatable/createPrivateActivable/CreatePrivateActivatable.java b/test/java/rmi/activation/Activatable/createPrivateActivable/CreatePrivateActivatable.java
--- a/test/java/rmi/activation/Activatable/createPrivateActivable/CreatePrivateActivatable.java
+++ b/test/java/rmi/activation/Activatable/createPrivateActivable/CreatePrivateActivatable.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -155,7 +155,7 @@
e.getClass().getName(), e);
} finally {
- ActivationLibrary.rmidCleanup(rmid);
+ rmid.cleanup();
obj = null;
}
}
diff --git a/test/java/rmi/activation/Activatable/downloadParameterClass/DownloadParameterClass.java b/test/java/rmi/activation/Activatable/downloadParameterClass/DownloadParameterClass.java
--- a/test/java/rmi/activation/Activatable/downloadParameterClass/DownloadParameterClass.java
+++ b/test/java/rmi/activation/Activatable/downloadParameterClass/DownloadParameterClass.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2012, 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
@@ -138,7 +138,7 @@
} catch (Exception e) {
TestLibrary.bomb("test failed", e);
} finally {
- ActivationLibrary.rmidCleanup(rmid);
+ rmid.cleanup();
}
}
}
diff --git a/test/java/rmi/activation/Activatable/elucidateNoSuchMethod/ElucidateNoSuchMethod.java b/test/java/rmi/activation/Activatable/elucidateNoSuchMethod/ElucidateNoSuchMethod.java
--- a/test/java/rmi/activation/Activatable/elucidateNoSuchMethod/ElucidateNoSuchMethod.java
+++ b/test/java/rmi/activation/Activatable/elucidateNoSuchMethod/ElucidateNoSuchMethod.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2012, 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
@@ -135,7 +135,7 @@
} catch (Exception e) {
TestLibrary.bomb("test failed", e);
} finally {
- ActivationLibrary.rmidCleanup(rmid);
+ rmid.cleanup();
}
}
}
diff --git a/test/java/rmi/activation/Activatable/extLoadedImpl/ExtLoadedImplTest.java b/test/java/rmi/activation/Activatable/extLoadedImpl/ExtLoadedImplTest.java
--- a/test/java/rmi/activation/Activatable/extLoadedImpl/ExtLoadedImplTest.java
+++ b/test/java/rmi/activation/Activatable/extLoadedImpl/ExtLoadedImplTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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
@@ -69,7 +69,7 @@
} catch (Exception e) {
TestLibrary.bomb("test failed", e);
} finally {
- ActivationLibrary.rmidCleanup(rmid);
+ rmid.cleanup();
}
}
}
diff --git a/test/java/rmi/activation/Activatable/forceLogSnapshot/ForceLogSnapshot.java b/test/java/rmi/activation/Activatable/forceLogSnapshot/ForceLogSnapshot.java
--- a/test/java/rmi/activation/Activatable/forceLogSnapshot/ForceLogSnapshot.java
+++ b/test/java/rmi/activation/Activatable/forceLogSnapshot/ForceLogSnapshot.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2012, 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
@@ -248,7 +248,7 @@
} catch (Exception e) {
TestLibrary.bomb("test failed", e);
} finally {
- ActivationLibrary.rmidCleanup(rmid);
+ rmid.cleanup();
for (int i = 0 ; i < HOW_MANY ; i ++) {
TestLibrary.unexport(unicastObjs[i]);
}
diff --git a/test/java/rmi/activation/Activatable/inactiveGroup/InactiveGroup.java b/test/java/rmi/activation/Activatable/inactiveGroup/InactiveGroup.java
--- a/test/java/rmi/activation/Activatable/inactiveGroup/InactiveGroup.java
+++ b/test/java/rmi/activation/Activatable/inactiveGroup/InactiveGroup.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2012, 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
@@ -174,7 +174,7 @@
} catch (Exception e) {
TestLibrary.bomb("test failed", e);
} finally {
- ActivationLibrary.rmidCleanup(rmid);
+ rmid.cleanup();
}
}
}
diff --git a/test/java/rmi/activation/Activatable/lookupActivationSystem/LookupActivationSystem.java b/test/java/rmi/activation/Activatable/lookupActivationSystem/LookupActivationSystem.java
--- a/test/java/rmi/activation/Activatable/lookupActivationSystem/LookupActivationSystem.java
+++ b/test/java/rmi/activation/Activatable/lookupActivationSystem/LookupActivationSystem.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
@@ -118,7 +118,7 @@
} finally {
- ActivationLibrary.rmidCleanup(rmid);
+ rmid.cleanup();
}
}
}
diff --git a/test/java/rmi/activation/Activatable/nestedActivate/NestedActivate.java b/test/java/rmi/activation/Activatable/nestedActivate/NestedActivate.java
--- a/test/java/rmi/activation/Activatable/nestedActivate/NestedActivate.java
+++ b/test/java/rmi/activation/Activatable/nestedActivate/NestedActivate.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2012, 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
@@ -165,7 +165,7 @@
} catch (Exception e) {
TestLibrary.bomb("test failed", e);
} finally {
- ActivationLibrary.rmidCleanup(rmid);
+ rmid.cleanup();
}
}
}
diff --git a/test/java/rmi/activation/Activatable/nonExistentActivatable/NonExistentActivatable.java b/test/java/rmi/activation/Activatable/nonExistentActivatable/NonExistentActivatable.java
--- a/test/java/rmi/activation/Activatable/nonExistentActivatable/NonExistentActivatable.java
+++ b/test/java/rmi/activation/Activatable/nonExistentActivatable/NonExistentActivatable.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2012, 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
@@ -139,7 +139,7 @@
} catch (Exception e) {
TestLibrary.bomb("test failed", e);
} finally {
- ActivationLibrary.rmidCleanup(rmid);
+ rmid.cleanup();
}
}
}
diff --git a/test/java/rmi/activation/Activatable/restartCrashedService/RestartCrashedService.java b/test/java/rmi/activation/Activatable/restartCrashedService/RestartCrashedService.java
--- a/test/java/rmi/activation/Activatable/restartCrashedService/RestartCrashedService.java
+++ b/test/java/rmi/activation/Activatable/restartCrashedService/RestartCrashedService.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2012, 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
@@ -231,7 +231,7 @@
} catch (Exception e) {
TestLibrary.bomb("test failed", e);
} finally {
- ActivationLibrary.rmidCleanup(rmid);
+ rmid.cleanup();
TestLibrary.unexport(unicastObj);
}
}
diff --git a/test/java/rmi/activation/Activatable/restartLatecomer/RestartLatecomer.java b/test/java/rmi/activation/Activatable/restartLatecomer/RestartLatecomer.java
--- a/test/java/rmi/activation/Activatable/restartLatecomer/RestartLatecomer.java
+++ b/test/java/rmi/activation/Activatable/restartLatecomer/RestartLatecomer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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
@@ -247,7 +247,7 @@
} catch (Exception e) {
TestLibrary.bomb(e);
} finally {
- ActivationLibrary.rmidCleanup(rmid);
+ rmid.cleanup();
TestLibrary.unexport(callbackObj);
}
}
diff --git a/test/java/rmi/activation/Activatable/restartService/RestartService.java b/test/java/rmi/activation/Activatable/restartService/RestartService.java
--- a/test/java/rmi/activation/Activatable/restartService/RestartService.java
+++ b/test/java/rmi/activation/Activatable/restartService/RestartService.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2012, 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
@@ -221,7 +221,7 @@
} catch (Exception e) {
TestLibrary.bomb("test failed", e);
} finally {
- ActivationLibrary.rmidCleanup(rmid);
+ rmid.cleanup();
TestLibrary.unexport(unicastObj);
}
}
diff --git a/test/java/rmi/activation/Activatable/unregisterInactive/UnregisterInactive.java b/test/java/rmi/activation/Activatable/unregisterInactive/UnregisterInactive.java
--- a/test/java/rmi/activation/Activatable/unregisterInactive/UnregisterInactive.java
+++ b/test/java/rmi/activation/Activatable/unregisterInactive/UnregisterInactive.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2012, 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
@@ -125,7 +125,7 @@
} catch (Exception e) {
TestLibrary.bomb("test failed", e);
} finally {
- ActivationLibrary.rmidCleanup(rmid);
+ rmid.cleanup();
}
}
}
diff --git a/test/java/rmi/activation/ActivateFailedException/activateFails/ActivateFails.java b/test/java/rmi/activation/ActivateFailedException/activateFails/ActivateFails.java
--- a/test/java/rmi/activation/ActivateFailedException/activateFails/ActivateFails.java
+++ b/test/java/rmi/activation/ActivateFailedException/activateFails/ActivateFails.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2012, 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
@@ -163,7 +163,7 @@
} finally {
obj1 = obj2 = null;
- ActivationLibrary.rmidCleanup(rmid);
+ rmid.cleanup();
}
}
}
diff --git a/test/java/rmi/activation/ActivationGroup/downloadActivationGroup/DownloadActivationGroup.java b/test/java/rmi/activation/ActivationGroup/downloadActivationGroup/DownloadActivationGroup.java
--- a/test/java/rmi/activation/ActivationGroup/downloadActivationGroup/DownloadActivationGroup.java
+++ b/test/java/rmi/activation/ActivationGroup/downloadActivationGroup/DownloadActivationGroup.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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
@@ -156,7 +156,7 @@
} catch (Exception e) {
TestLibrary.bomb(e);
} finally {
- ActivationLibrary.rmidCleanup(rmid);
+ rmid.cleanup();
}
}
}
diff --git a/test/java/rmi/activation/ActivationSystem/activeGroup/IdempotentActiveGroup.java b/test/java/rmi/activation/ActivationSystem/activeGroup/IdempotentActiveGroup.java
--- a/test/java/rmi/activation/ActivationSystem/activeGroup/IdempotentActiveGroup.java
+++ b/test/java/rmi/activation/ActivationSystem/activeGroup/IdempotentActiveGroup.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2012, 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
@@ -108,7 +108,7 @@
} catch (NoSuchObjectException unexpected) {
throw new AssertionError(unexpected);
}
- ActivationLibrary.rmidCleanup(rmid);
+ rmid.cleanup();
}
}
diff --git a/test/java/rmi/activation/ActivationSystem/modifyDescriptor/ModifyDescriptor.java b/test/java/rmi/activation/ActivationSystem/modifyDescriptor/ModifyDescriptor.java
--- a/test/java/rmi/activation/ActivationSystem/modifyDescriptor/ModifyDescriptor.java
+++ b/test/java/rmi/activation/ActivationSystem/modifyDescriptor/ModifyDescriptor.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2012, 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
@@ -250,7 +250,7 @@
} catch (Exception e) {
TestLibrary.bomb("test failed", e);
} finally {
- ActivationLibrary.rmidCleanup(rmid);
+ rmid.cleanup();
}
}
}
diff --git a/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/StubClassesPermitted.java b/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/StubClassesPermitted.java
--- a/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/StubClassesPermitted.java
+++ b/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/StubClassesPermitted.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -171,7 +171,7 @@
}
canCreateStubs = null;
- ActivationLibrary.rmidCleanup(rmid);
+ rmid.cleanup();
System.err.println("rmid shut down");
}
}
diff --git a/test/java/rmi/activation/ActivationSystem/unregisterGroup/UnregisterGroup.java b/test/java/rmi/activation/ActivationSystem/unregisterGroup/UnregisterGroup.java
--- a/test/java/rmi/activation/ActivationSystem/unregisterGroup/UnregisterGroup.java
+++ b/test/java/rmi/activation/ActivationSystem/unregisterGroup/UnregisterGroup.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
@@ -156,7 +156,7 @@
} catch (Exception e) {
TestLibrary.bomb("test failed", e);
} finally {
- ActivationLibrary.rmidCleanup(rmid);
+ rmid.cleanup();
}
}
}
diff --git a/test/java/rmi/activation/CommandEnvironment/SetChildEnv.java b/test/java/rmi/activation/CommandEnvironment/SetChildEnv.java
--- a/test/java/rmi/activation/CommandEnvironment/SetChildEnv.java
+++ b/test/java/rmi/activation/CommandEnvironment/SetChildEnv.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2012, 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
@@ -203,7 +203,7 @@
actsys.unregisterGroup(gid);
Thread.sleep(5000);
- ActivationLibrary.rmidCleanup(rmid);
+ rmid.cleanup();
}
public static class DebugExecWatcher
diff --git a/test/java/rmi/activation/rmidViaInheritedChannel/InheritedChannelNotServerSocket.java b/test/java/rmi/activation/rmidViaInheritedChannel/InheritedChannelNotServerSocket.java
--- a/test/java/rmi/activation/rmidViaInheritedChannel/InheritedChannelNotServerSocket.java
+++ b/test/java/rmi/activation/rmidViaInheritedChannel/InheritedChannelNotServerSocket.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
@@ -121,7 +121,7 @@
if (obj != null) {
UnicastRemoteObject.unexportObject(obj, true);
}
- ActivationLibrary.rmidCleanup(rmid);
+ rmid.cleanup();
}
}
diff --git a/test/java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java b/test/java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java
--- a/test/java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java
+++ b/test/java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2012, 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
@@ -119,7 +119,7 @@
if (obj != null) {
UnicastRemoteObject.unexportObject(obj, true);
}
- ActivationLibrary.rmidCleanup(rmid);
+ rmid.cleanup();
}
}
diff --git a/test/java/rmi/registry/altSecurityManager/AltSecurityManager.java b/test/java/rmi/registry/altSecurityManager/AltSecurityManager.java
--- a/test/java/rmi/registry/altSecurityManager/AltSecurityManager.java
+++ b/test/java/rmi/registry/altSecurityManager/AltSecurityManager.java
@@ -104,13 +104,6 @@
utilityToStart + " to die");
if (time >= TIME_OUT) {
-
- // dont pollute other tests; increase the likelihood
- // that rmid will go away if it did not exit already.
- if (utility.equals(ACTIVATION)) {
- RMID.shutdown(port);
- }
-
TestLibrary.bomb(utilityToStart +
" took too long to die...");
} else {
diff --git a/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/UseCustomSocketFactory.java b/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/UseCustomSocketFactory.java
--- a/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/UseCustomSocketFactory.java
+++ b/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/UseCustomSocketFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2012, 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
@@ -58,7 +58,7 @@
RMID rmid = null;
try {
- rmid = RMID.createRMID(true);
+ rmid = RMID.createRMID();
rmid.addArguments(new String[] {
"-C-Djava.security.policy=" +
TestParams.defaultGroupPolicy +
diff --git a/test/java/rmi/testlibrary/ActivationLibrary.java b/test/java/rmi/testlibrary/ActivationLibrary.java
--- a/test/java/rmi/testlibrary/ActivationLibrary.java
+++ b/test/java/rmi/testlibrary/ActivationLibrary.java
@@ -102,68 +102,4 @@
} catch (NoSuchObjectException e) {
}
}
-
- /** cleanup after rmid */
- public static void rmidCleanup(RMID rmid) {
- if (rmid != null) {
- if (!ActivationLibrary.safeDestroy(rmid, SAFE_WAIT_TIME)) {
- TestLibrary.bomb("rmid not destroyed in: " +
- SAFE_WAIT_TIME +
- " milliseconds");
- }
- }
- RMID.removeLog();
- }
-
- /**
- * Invoke shutdown on rmid in a way that will not cause a test
- * to hang.
- *
- * @return whether or not shutdown completed succesfully in the
- * timeAllowed
- */
- private static boolean safeDestroy(RMID rmid, long timeAllowed) {
- DestroyThread destroyThread = new DestroyThread(rmid);
- destroyThread.start();
-
- try {
- destroyThread.join(timeAllowed);
- } catch (InterruptedException ie) {
- Thread.currentThread().interrupt();
- }
-
- return destroyThread.shutdownSucceeded();
- }
-
- /**
- * Thread class to handle the destruction of rmid
- */
- private static class DestroyThread extends Thread {
- private final RMID rmid;
- private final int port;
- private boolean succeeded = false;
-
- DestroyThread(RMID rmid) {
- this.rmid = rmid;
- this.port = rmid.getPort();
- this.setDaemon(true);
- }
-
- public void run() {
- if (RMID.lookupSystem(port) != null) {
- rmid.destroy();
- synchronized (this) {
- // flag that the test was able to shutdown rmid
- succeeded = true;
- }
- mesg("finished destroying rmid");
- } else {
- mesg("tried to shutdown when rmid was not running");
- }
- }
-
- public synchronized boolean shutdownSucceeded() {
- return succeeded;
- }
- }
}
diff --git a/test/java/rmi/testlibrary/RMID.java b/test/java/rmi/testlibrary/RMID.java
--- a/test/java/rmi/testlibrary/RMID.java
+++ b/test/java/rmi/testlibrary/RMID.java
@@ -21,14 +21,11 @@
* questions.
*/
-/**
- *
- */
-
import java.io.*;
import java.rmi.*;
import java.rmi.activation.*;
import java.rmi.registry.*;
+import java.util.concurrent.TimeoutException;
/**
* Utility class that creates an instance of rmid with a policy
@@ -39,6 +36,14 @@
*/
public class RMID extends JavaVM {
+ // TODO: adjust these based on the timeout factor
+ // such as jcov.sleep.multiplier; see start(long) method.
+ // Also consider the test.timeout.factor property (a float).
+ private static final long TIMEOUT_SHUTDOWN_MS = 60_000L;
+ private static final long TIMEOUT_DESTROY_MS = 10_000L;
+ private static final long STARTTIME_MS = 15_000L;
+ private static final long POLLTIME_MS = 100L;
+
private static final String SYSTEM_NAME = ActivationSystem.class.getName();
// "java.rmi.activation.ActivationSystem"
@@ -140,15 +145,8 @@
* policy file.
*/
public static RMID createRMID() {
- return createRMID(System.out, System.err, true);
- }
-
- public static RMID createRMID(boolean debugExec) {
- return createRMID(System.out, System.err, debugExec);
- }
-
- public static RMID createRMID(OutputStream out, OutputStream err) {
- return createRMID(out, err, true);
+ return createRMID(System.out, System.err, true, true,
+ TestLibrary.getUnusedRandomPort());
}
public static RMID createRMID(OutputStream out, OutputStream err,
@@ -173,24 +171,24 @@
/**
- * Test RMID should be created with the createRMID method.
+ * Private constructor. RMID instances should be created
+ * using the static factory methods.
*/
- protected RMID(String classname, String options, String args,
+ private RMID(String classname, String options, String args,
OutputStream out, OutputStream err, int port)
{
super(classname, options, args, out, err);
this.port = port;
}
+ /**
+ * Removes rmid's log file directory.
+ */
public static void removeLog() {
- /*
- * Remove previous log file directory before
- * starting up rmid.
- */
File f = new File(LOGDIR, log);
if (f.exists()) {
- mesg("removing rmid's old log file...");
+ mesg("Removing rmid's old log file.");
String[] files = f.list();
if (files != null) {
@@ -199,8 +197,8 @@
}
}
- if (f.delete() != true) {
- mesg("\t" + " unable to delete old log file.");
+ if (! f.delete()) {
+ mesg("Warning: unable to delete old log file.");
}
}
}
@@ -215,14 +213,6 @@
return TestLibrary.getExtraProperty("rmid.jcov.args","");
}
- public void start() throws IOException {
- start(10000);
- }
-
- public void slowStart() throws IOException {
- start(60000);
- }
-
/**
* Looks up the activation system in the registry on the given port,
* returning its stub, or null if it's not present. This method differs from
@@ -239,12 +229,24 @@
}
}
+ /**
+ * Starts rmid and waits up to the default timeout period
+ * to confirm that it's running.
+ */
+ public void start() throws IOException {
+ start(STARTTIME_MS);
+ }
+
+ /**
+ * Starts rmid and waits up to the given timeout period
+ * to confirm that it's running.
+ */
public void start(long waitTime) throws IOException {
// if rmid is already running, then the test will fail with
// a well recognized exception (port already in use...).
- mesg("starting rmid on port #" + port + "...");
+ mesg("Starting rmid on port " + port + ".");
super.start();
int slopFactor = 1;
@@ -254,20 +256,17 @@
} catch (NumberFormatException ignore) {}
waitTime = waitTime * slopFactor;
- // We check several times (as many as provides passed waitTime) to
- // see if Rmid is currently running. Waiting steps last 100 msecs.
- final long rmidStartSleepTime = 100;
+ // We check several times, for a maximum of waitTime, until we have
+ // verified that rmid is running.
do {
- // Sleeping for another rmidStartSleepTime time slice.
try {
- Thread.sleep(Math.min(waitTime, rmidStartSleepTime));
+ Thread.sleep(Math.min(waitTime, POLLTIME_MS));
} catch (InterruptedException ie) {
Thread.currentThread().interrupt();
- mesg("Thread interrupted while checking for start of Activation System. Giving up check.");
- mesg("Activation System state unknown");
+ mesg("Interrupted while starting activation system, giving up.");
return;
}
- waitTime -= rmidStartSleepTime;
+ waitTime -= POLLTIME_MS;
// Checking if rmid is present
if (lookupSystem(port) != null) {
@@ -279,7 +278,7 @@
* incorrect value.
*/
System.setProperty("java.rmi.activation.port", Integer.toString(port));
- mesg("finished starting rmid.");
+ mesg("Started successfully.");
return;
} else {
if (waitTime > 0) {
@@ -287,9 +286,15 @@
}
}
} while (waitTime > 0);
- TestLibrary.bomb("start rmid failed... giving up", null);
+ TestLibrary.bomb("Failed to start rmid, giving up.", null);
}
+ /**
+ * Destroys rmid and restarts it. Note that this does NOT clean up
+ * the log file, because it stores information about restartable
+ * and activatable objects that must be carried over to the new
+ * rmid instance.
+ */
public void restart() throws IOException {
destroy();
start();
@@ -298,30 +303,35 @@
/**
* Ask rmid to shutdown gracefully using a remote method call.
* catch any errors that might occur from rmid not being present
- * at time of shutdown invocation.
- *
- * Shutdown does not nullify possible references to the rmid
- * process object (destroy does though).
+ * at time of shutdown invocation. If the remote call is
+ * successful, wait for the process to terminate. Return true
+ * if the process terminated, otherwise return false.
*/
- public static void shutdown(int port) {
+ private boolean shutdown() throws InterruptedException {
+ mesg("shutdown()");
+ ActivationSystem system = lookupSystem(port);
+ if (system == null) {
+ mesg("lookupSystem() returned null");
+ return false;
+ }
try {
- ActivationSystem system = lookupSystem(port);
-
- if (system == null) {
- TestLibrary.bomb("reference to the activation system was null");
- }
-
+ mesg("ActivationSystem.shutdown()");
system.shutdown();
- } catch (RemoteException re) {
- mesg("shutting down the activation daemon failed");
} catch (Exception e) {
- mesg("caught exception trying to shutdown rmid");
- mesg(e.getMessage());
+ mesg("Caught exception from ActivationSystem.shutdown():");
e.printStackTrace();
}
- mesg("testlibrary finished shutting down rmid");
+ try {
+ waitFor(TIMEOUT_SHUTDOWN_MS);
+ mesg("Shutdown successful.");
+ return true;
+ } catch (TimeoutException ex) {
+ mesg("Shutdown timed out:");
+ ex.printStackTrace();
+ return false;
+ }
}
/**
@@ -330,60 +340,46 @@
* if rmid is a child process of the current VM.
*/
public void destroy() {
- // attempt graceful shutdown of the activation system
- shutdown(port);
+ if (vm == null) {
+ throw new IllegalStateException("can't wait for RMID that isn't running");
+ }
- if (vm != null) {
- try {
- /* Waiting for distant RMID process to shutdown.
- * Waiting is bounded at a hardcoded max of 60 secs (1 min).
- * Waiting by steps of 200 msecs, thus at most 300 such attempts
- * for termination of distant RMID process. If process is not
- * known to be terminated properly after that time,
- * we give up for a gracefull termination, and thus go for
- * forcibly destroying the process.
- */
- boolean vmEnded = false;
- int waitingTrials = 0;
- final int maxTrials = 300;
- final long vmProcessEndWaitInterval = 200;
- int vmExitValue;
- do {
- try {
- Thread.sleep(vmProcessEndWaitInterval);
- waitingTrials++;
- vmExitValue = vm.exitValue();
- mesg("rmid exited on shutdown request");
- vmEnded = true;
- } catch (IllegalThreadStateException illegal) {
- mesg("RMID's process still not terminated after more than " +
- (waitingTrials * vmProcessEndWaitInterval) + " milliseconds");
- }
+ // First, attempt graceful shutdown of the activation system.
+ try {
+ if (! shutdown()) {
+ // Graceful shutdown failed, use Process.destroy().
+ mesg("Destroying RMID process.");
+ vm.destroy();
+ try {
+ waitFor(TIMEOUT_DESTROY_MS);
+ mesg("Destroy successful.");
+ } catch (TimeoutException ex) {
+ mesg("Destroy timed out, giving up.");
+ ex.printStackTrace();
}
- while (!vmEnded &&
- (waitingTrials < maxTrials));
-
- if (waitingTrials >= maxTrials) {
- mesg("RMID's process still not terminated after more than " +
- (waitingTrials * vmProcessEndWaitInterval) + " milliseconds." +
- "Givinp up gracefull termination...");
- mesg("destroying RMID's process using Process.destroy()");
- super.destroy();
- }
+ }
+ } catch (InterruptedException ie) {
+ mesg("Shutdown/destroy interrupted, giving up.");
+ ie.printStackTrace();
+ Thread.currentThread().interrupt();
+ return;
+ }
- } catch (InterruptedException ie) {
- Thread.currentThread().interrupt();
- mesg("Thread interrupted while checking for termination of distant rmid vm. Giving up check.");
- } catch (Exception e) {
- mesg("caught unexpected exception trying to destroy rmid: " +
- e.getMessage());
- e.printStackTrace();
- }
-
- // rmid will not restart if its process is not null
- vm = null;
- }
+ vm = null;
}
- public int getPort() {return port;}
+ /**
+ * Shuts down rmid and then removes its log file.
+ */
+ public void cleanup() {
+ destroy();
+ RMID.removeLog();
+ }
+
+ /**
+ * Gets the port on which this rmid is listening.
+ */
+ public int getPort() {
+ return port;
+ }
}
diff --git a/test/javax/accessibility/6192422/bug6192422.java b/test/javax/accessibility/6192422/bug6192422.java
new file mode 100644
--- /dev/null
+++ b/test/javax/accessibility/6192422/bug6192422.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 2005, 2019, 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 javax.accessibility.Accessible;
+import javax.accessibility.AccessibleContext;
+import javax.accessibility.AccessibleRole;
+import javax.swing.JFrame;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.SwingUtilities;
+
+/**
+ * @test
+ * @bug 6192422 7106851
+ * @key headful
+ * @summary Verifies fix for JMenuBar not being in the accessibility hierarchy
+ */
+public class bug6192422 {
+
+ private static boolean foundJMenuBar = false;
+
+ public static void main(String[] args) throws Throwable {
+ SwingUtilities.invokeAndWait(new Runnable() {
+ public void run() {
+ if (!testIt()) {
+ throw new RuntimeException("JMenuBar was not found");
+ }
+ }
+ });
+ }
+
+ /*
+ * Test whether JMenuBar is in accessibility hierarchy
+ */
+ private static boolean testIt() {
+
+ JFrame frame = new JFrame("bug6192422");
+ frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+
+ /*
+ * Add a menu bar to the frame using setJMenuBar. The setJMenuBar
+ * method add the menu bar to the JLayeredPane.
+ */
+ JMenuBar menuBar = new JMenuBar();
+ menuBar.add(new JMenu("foo"));
+ menuBar.add(new JMenu("bar"));
+ menuBar.add(new JMenu("baz"));
+ frame.setJMenuBar(menuBar);
+
+ findJMenuBar(frame.getAccessibleContext());
+ return foundJMenuBar;
+ }
+
+ /*
+ * Finds the JMenuBar in the Accessibility hierarchy
+ */
+ private static void findJMenuBar(AccessibleContext ac) {
+ if (ac != null) {
+ System.err.println("findJMenuBar: ac = "+ac.getClass());
+ int num = ac.getAccessibleChildrenCount();
+ System.err.println(" #children "+num);
+
+ for (int i = 0; i < num; i++) {
+ System.err.println(" child #"+i);
+ Accessible a = ac.getAccessibleChild(i);
+ AccessibleContext child = a.getAccessibleContext();
+ AccessibleRole role = child.getAccessibleRole();
+ System.err.println(" role "+role);
+ if (role == AccessibleRole.MENU_BAR) {
+ foundJMenuBar = true;
+ return;
+ }
+ if (child.getAccessibleChildrenCount() > 0) {
+ findJMenuBar(child);
+ }
+ }
+ }
+ }
+}
diff --git a/test/javax/swing/JComboBox/8032878/bug8032878.java b/test/javax/swing/JComboBox/8032878/bug8032878.java
--- a/test/javax/swing/JComboBox/8032878/bug8032878.java
+++ b/test/javax/swing/JComboBox/8032878/bug8032878.java
@@ -22,13 +22,10 @@
*/
/* @test
- * @bug 8032878
+ * @bug 8032878 8078855
* @summary Checks that JComboBox as JTable cell editor processes key events
* even where setSurrendersFocusOnKeystroke flag in JTable is false and
* that it does not lose the first key press where the flag is true.
- * @library ../../regtesthelpers
- * @build Util
- * @author Alexey Ivanov
* @run main bug8032878
*/
@@ -36,6 +33,7 @@
import java.awt.event.KeyEvent;
import javax.swing.*;
import javax.swing.text.JTextComponent;
+import javax.swing.plaf.metal.MetalLookAndFeel;
public class bug8032878 implements Runnable {
private static final String ONE = "one";
@@ -53,6 +51,8 @@
private volatile String text;
public static void main(String[] args) throws Exception {
+ UIManager.setLookAndFeel(new MetalLookAndFeel());
+
final bug8032878 test = new bug8032878();
test.test(false);
@@ -81,6 +81,7 @@
frame.pack();
frame.setVisible(true);
+ frame.setLocationRelativeTo(null);
}
private void test(final boolean flag) throws Exception {
@@ -88,11 +89,13 @@
surrender = flag;
SwingUtilities.invokeAndWait(this);
+ robot.waitForIdle();
+ robot.delay(1000);
runTest();
checkResult();
} finally {
if (frame != null) {
- frame.dispose();
+ SwingUtilities.invokeAndWait(() -> frame.dispose());
}
}
}
@@ -100,12 +103,20 @@
private void runTest() throws Exception {
robot.waitForIdle();
// Select 'one'
- Util.hitKeys(robot, KeyEvent.VK_TAB);
+ robot.keyPress(KeyEvent.VK_TAB);
+ robot.keyRelease(KeyEvent.VK_TAB);
+ robot.waitForIdle();
+ robot.keyPress(KeyEvent.VK_1);
+ robot.keyRelease(KeyEvent.VK_1);
robot.waitForIdle();
- Util.hitKeys(robot, KeyEvent.VK_1);
- Util.hitKeys(robot, KeyEvent.VK_2);
- Util.hitKeys(robot, KeyEvent.VK_3);
- Util.hitKeys(robot, KeyEvent.VK_ENTER);
+ robot.keyPress(KeyEvent.VK_2);
+ robot.keyRelease(KeyEvent.VK_2);
+ robot.waitForIdle();
+ robot.keyPress(KeyEvent.VK_3);
+ robot.keyRelease(KeyEvent.VK_3);
+ robot.waitForIdle();
+ robot.keyPress(KeyEvent.VK_ENTER);
+ robot.keyRelease(KeyEvent.VK_ENTER);
robot.waitForIdle();
}
diff --git a/test/javax/swing/JScrollBar/bug4202954/bug4202954.java b/test/javax/swing/JScrollBar/bug4202954/bug4202954.java
--- a/test/javax/swing/JScrollBar/bug4202954/bug4202954.java
+++ b/test/javax/swing/JScrollBar/bug4202954/bug4202954.java
@@ -53,8 +53,8 @@
if (rightScrollButton == null || bottomScrollButton == null) {
String errMessage = "Test can't be executed: ";
- errMessage = errMessage + rightScrollButton == null ? "can't find right button for horizontal scroll bar; " : ""
- + bottomScrollButton == null ? "can't find bottom scroll button for vertical scroll bar" : "";
+ errMessage = errMessage + (rightScrollButton == null ? "can't find right button for horizontal scroll bar; " : ""
+ + (bottomScrollButton == null ? "can't find bottom scroll button for vertical scroll bar" : ""));
throw new RuntimeException(errMessage);
}
@@ -105,15 +105,25 @@
JButton button = Util.invokeOnEDT(new java.util.concurrent.Callable<JButton>() {
@Override
public JButton call() throws Exception {
- for (Component c: scrollBar.getComponents()) {
- if (c instanceof JButton) {
- Point p = c.getLocationOnScreen();
- if (p.x > minX && p.y > minY) {
- return (JButton) c;
- }
- }
- }
- return null;
+ int currentXorY = 0;
+ JButton scrollButton = null;
+ for (Component c: scrollBar.getComponents()) {
+ if (c instanceof JButton) {
+ Point p = c.getLocationOnScreen();
+ if (scrollBar.getOrientation() == Adjustable.VERTICAL){
+ if (currentXorY <= p.y){
+ currentXorY = p.y;
+ scrollButton = (JButton)c;
+ }
+ }else if (scrollBar.getOrientation() == Adjustable.HORIZONTAL){
+ if (currentXorY <= p.x){
+ currentXorY = p.x;
+ scrollButton = (JButton)c;
+ }
+ }
+ }
+ }
+ return scrollButton;
}
});
return button;
diff --git a/test/javax/swing/plaf/aqua/CustomComboBoxFocusTest.java b/test/javax/swing/plaf/aqua/CustomComboBoxFocusTest.java
--- a/test/javax/swing/plaf/aqua/CustomComboBoxFocusTest.java
+++ b/test/javax/swing/plaf/aqua/CustomComboBoxFocusTest.java
@@ -22,9 +22,11 @@
*/
/* @test
- @bug 8073001
+ @bug 8073001 8081764
@summary Test verifies that combo box with custom editor renders
focus ring around arrow button correctly.
+ @library /lib/testlibrary
+ @build jdk.testlibrary.OSInfo
@run main CustomComboBoxFocusTest
*/
@@ -50,12 +52,17 @@
import javax.swing.JPanel;
import javax.swing.JTextField;
import javax.swing.SwingUtilities;
+import jdk.testlibrary.OSInfo;
public class CustomComboBoxFocusTest {
private static CustomComboBoxFocusTest test = null;
public static void main(String[] args) {
+ if (OSInfo.getOSType() != OSInfo.OSType.MACOSX) {
+ System.out.println("Only Mac platform test. Test is skipped for other OS.");
+ return;
+ }
try {
SwingUtilities.invokeAndWait(new Runnable() {
diff --git a/test/sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.java b/test/sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.java
--- a/test/sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.java
+++ b/test/sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.java
@@ -309,6 +309,7 @@
String className = JavaProcess.class.getName();
String classPath = System.getProperty("test.classes");
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+ "-XX:+UsePerfData",
"-Dtest.timeout.factor=" + System.getProperty("test.timeout.factor", "1.0"),
"-cp", classPath, className, mainArgsIdentifier);
OutputBuffer ob = ProcessTools.getOutput(pb.start());
diff --git a/test/sun/security/pkcs12/EmptyPassword.java b/test/sun/security/pkcs12/EmptyPassword.java
new file mode 100644
--- /dev/null
+++ b/test/sun/security/pkcs12/EmptyPassword.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2018, 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 8202299
+ * @modules java.base/sun.security.tools.keytool
+ * java.base/sun.security.x509
+ * @library /lib /
+ * @summary Java Keystore fails to load PKCS12/PFX certificates created in WindowsServer2016
+ */
+
+import jdk.test.lib.Asserts;
+import sun.security.tools.keytool.CertAndKeyGen;
+import sun.security.x509.X500Name;
+
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.security.KeyStore;
+import java.security.cert.Certificate;
+
+public class EmptyPassword {
+
+ public static void main(String[] args) throws Exception {
+
+ // KeyStore is protected with password "\0".
+ CertAndKeyGen gen = new CertAndKeyGen("RSA", "SHA256withRSA");
+ gen.generate(2048);
+ KeyStore ks = KeyStore.getInstance("PKCS12");
+ ks.load(null, null);
+ ks.setKeyEntry("a", gen.getPrivateKey(), new char[1],
+ new Certificate[] {
+ gen.getSelfCertificate(new X500Name("CN=Me"), 100)
+ });
+ try (FileOutputStream fos = new FileOutputStream("p12")) {
+ ks.store(fos, new char[1]);
+ }
+
+ // It can be loaded with password "".
+ try (FileInputStream inStream = new FileInputStream("p12")) {
+ ks.load(inStream, new char[0]);
+ }
+ Asserts.assertTrue(ks.getKey("a", new char[0]) != null);
+ Asserts.assertTrue(ks.getCertificate("a") != null);
+ }
+}
diff --git a/test/sun/security/ssl/ALPN/AlpnGreaseTest.java b/test/sun/security/ssl/ALPN/AlpnGreaseTest.java
new file mode 100644
--- /dev/null
+++ b/test/sun/security/ssl/ALPN/AlpnGreaseTest.java
@@ -0,0 +1,314 @@
+/*
+ * Copyright (c) 2020, 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.
+ */
+
+// SunJSSE does not support dynamic system properties, no way to re-use
+// system properties in samevm/agentvm mode.
+
+/*
+ * @test
+ * @bug 8254631
+ * @summary Better support ALPN byte wire values in SunJSSE
+ * @library /javax/net/ssl/templates
+ * @run main/othervm AlpnGreaseTest
+ */
+import javax.net.ssl.*;
+import javax.net.ssl.SSLEngineResult.HandshakeStatus;
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+
+/**
+ * A SSLEngine usage example which simplifies the presentation
+ * by removing the I/O and multi-threading concerns.
+ *
+ * The test creates two SSLEngines, simulating a client and server.
+ * The "transport" layer consists two byte buffers: think of them
+ * as directly connected pipes.
+ *
+ * Note, this is a *very* simple example: real code will be much more
+ * involved. For example, different threading and I/O models could be
+ * used, transport mechanisms could close unexpectedly, and so on.
+ *
+ * When this application runs, notice that several messages
+ * (wrap/unwrap) pass before any application data is consumed or
+ * produced.
+ */
+public class AlpnGreaseTest implements SSLContextTemplate {
+
+ private final SSLEngine clientEngine; // client Engine
+ private final ByteBuffer clientOut; // write side of clientEngine
+ private final ByteBuffer clientIn; // read side of clientEngine
+
+ private final SSLEngine serverEngine; // server Engine
+ private final ByteBuffer serverOut; // write side of serverEngine
+ private final ByteBuffer serverIn; // read side of serverEngine
+
+ // For data transport, this example uses local ByteBuffers. This
+ // isn't really useful, but the purpose of this example is to show
+ // SSLEngine concepts, not how to do network transport.
+ private final ByteBuffer cTOs; // "reliable" transport client->server
+ private final ByteBuffer sTOc; // "reliable" transport server->client
+
+ // These are the various 8-bit char values that could be sent as GREASE
+ // values. We'll just make one big String here to make it easy to check
+ // that the right values are being output.
+ private static final byte[] greaseBytes = new byte[] {
+ (byte) 0x0A, (byte) 0x1A, (byte) 0x2A, (byte) 0x3A,
+ (byte) 0x4A, (byte) 0x5A, (byte) 0x6A, (byte) 0x7A,
+ (byte) 0x8A, (byte) 0x9A, (byte) 0xAA, (byte) 0xBA,
+ (byte) 0xCA, (byte) 0xDA, (byte) 0xEA, (byte) 0xFA
+ };
+
+ private static final String greaseString =
+ new String(greaseBytes, StandardCharsets.ISO_8859_1);
+
+ private static void findGreaseInClientHello(byte[] bytes) throws Exception {
+ for (int i = 0; i < bytes.length - greaseBytes.length; i++) {
+ if (findGreaseInArray(bytes, i)) {
+ System.out.println("Found greaseBytes in ClientHello at: " + i);
+ return;
+ }
+ }
+ throw new Exception("Couldn't find greaseBytes");
+ }
+
+ private static boolean findGreaseInArray(byte[] bytes, int startOff) {
+ for (int i = 0; i < greaseBytes.length; i++) {
+ if (bytes[startOff + i] != greaseBytes[i]) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ private AlpnGreaseTest() throws Exception {
+ serverEngine = configureServerEngine(
+ createServerSSLContext().createSSLEngine());
+
+ clientEngine = configureClientEngine(
+ createClientSSLContext().createSSLEngine());
+
+ // We'll assume the buffer sizes are the same
+ // between client and server.
+ SSLSession session = clientEngine.getSession();
+ int appBufferMax = session.getApplicationBufferSize();
+ int netBufferMax = session.getPacketBufferSize();
+
+ // We'll make the input buffers a bit bigger than the max needed
+ // size, so that unwrap()s following a successful data transfer
+ // won't generate BUFFER_OVERFLOWS.
+ //
+ // We'll use a mix of direct and indirect ByteBuffers for
+ // tutorial purposes only. In reality, only use direct
+ // ByteBuffers when they give a clear performance enhancement.
+ clientIn = ByteBuffer.allocate(appBufferMax + 50);
+ serverIn = ByteBuffer.allocate(appBufferMax + 50);
+
+ cTOs = ByteBuffer.allocateDirect(netBufferMax);
+ sTOc = ByteBuffer.allocateDirect(netBufferMax);
+
+ clientOut = ByteBuffer.wrap("Hi Server, I'm Client".getBytes());
+ serverOut = ByteBuffer.wrap("Hello Client, I'm Server".getBytes());
+ }
+
+ //
+ // Protected methods could be used to customize the test case.
+ //
+
+ /*
+ * Configure the client side engine.
+ */
+ protected SSLEngine configureClientEngine(SSLEngine clientEngine) {
+ clientEngine.setUseClientMode(true);
+
+ // Get/set parameters if needed
+ SSLParameters paramsClient = clientEngine.getSSLParameters();
+ paramsClient.setApplicationProtocols(new String[] { greaseString });
+
+ clientEngine.setSSLParameters(paramsClient);
+
+ return clientEngine;
+ }
+
+ /*
+ * Configure the server side engine.
+ */
+ protected SSLEngine configureServerEngine(SSLEngine serverEngine) {
+ serverEngine.setUseClientMode(false);
+ serverEngine.setNeedClientAuth(true);
+
+ // Get/set parameters if needed
+ //
+ SSLParameters paramsServer = serverEngine.getSSLParameters();
+ paramsServer.setApplicationProtocols(new String[] { greaseString });
+ serverEngine.setSSLParameters(paramsServer);
+
+ return serverEngine;
+ }
+
+ public static void main(String[] args) throws Exception {
+ new AlpnGreaseTest().runTest();
+ }
+
+ //
+ // Private methods that used to build the common part of the test.
+ //
+
+ private void runTest() throws Exception {
+ SSLEngineResult clientResult;
+ SSLEngineResult serverResult;
+
+ boolean dataDone = false;
+ boolean firstClientWrap = true;
+ while (isOpen(clientEngine) || isOpen(serverEngine)) {
+ log("=================");
+
+ // client wrap
+ log("---Client Wrap---");
+ clientResult = clientEngine.wrap(clientOut, cTOs);
+ logEngineStatus(clientEngine, clientResult);
+ runDelegatedTasks(clientEngine);
+
+ if (firstClientWrap) {
+ firstClientWrap = false;
+ byte[] bytes = new byte[cTOs.position()];
+ ((ByteBuffer)(cTOs.duplicate().flip())).get(bytes);
+ findGreaseInClientHello(bytes);
+ }
+
+ // server wrap
+ log("---Server Wrap---");
+ serverResult = serverEngine.wrap(serverOut, sTOc);
+ logEngineStatus(serverEngine, serverResult);
+ runDelegatedTasks(serverEngine);
+
+ cTOs.flip();
+ sTOc.flip();
+
+ // client unwrap
+ log("---Client Unwrap---");
+ clientResult = clientEngine.unwrap(sTOc, clientIn);
+ logEngineStatus(clientEngine, clientResult);
+ runDelegatedTasks(clientEngine);
+
+ // server unwrap
+ log("---Server Unwrap---");
+ serverResult = serverEngine.unwrap(cTOs, serverIn);
+ logEngineStatus(serverEngine, serverResult);
+ runDelegatedTasks(serverEngine);
+
+ cTOs.compact();
+ sTOc.compact();
+
+ // After we've transferred all application data between the client
+ // and server, we close the clientEngine's outbound stream.
+ // This generates a close_notify handshake message, which the
+ // server engine receives and responds by closing itself.
+ if (!dataDone && (clientOut.limit() == serverIn.position()) &&
+ (serverOut.limit() == clientIn.position())) {
+
+ // Check ALPN Value
+ String alpnServerValue = serverEngine.getApplicationProtocol();
+ String alpnClientValue = clientEngine.getApplicationProtocol();
+
+ if (!alpnServerValue.equals(greaseString)
+ || !alpnClientValue.equals(greaseString)) {
+ throw new Exception("greaseString didn't match");
+ }
+
+ // A sanity check to ensure we got what was sent.
+ checkTransfer(serverOut, clientIn);
+ checkTransfer(clientOut, serverIn);
+
+ log("\tClosing clientEngine's *OUTBOUND*...");
+ clientEngine.closeOutbound();
+ logEngineStatus(clientEngine);
+
+ dataDone = true;
+ log("\tClosing serverEngine's *OUTBOUND*...");
+ serverEngine.closeOutbound();
+ logEngineStatus(serverEngine);
+ }
+ }
+ }
+
+ private static boolean isOpen(SSLEngine engine) {
+ return (!engine.isOutboundDone() || !engine.isInboundDone());
+ }
+
+ private static void logEngineStatus(SSLEngine engine) {
+ log("\tCurrent HS State: " + engine.getHandshakeStatus());
+ log("\tisInboundDone() : " + engine.isInboundDone());
+ log("\tisOutboundDone(): " + engine.isOutboundDone());
+ }
+
+ private static void logEngineStatus(
+ SSLEngine engine, SSLEngineResult result) {
+ log("\tResult Status : " + result.getStatus());
+ log("\tResult HS Status : " + result.getHandshakeStatus());
+ log("\tEngine HS Status : " + engine.getHandshakeStatus());
+ log("\tisInboundDone() : " + engine.isInboundDone());
+ log("\tisOutboundDone() : " + engine.isOutboundDone());
+ log("\tMore Result : " + result);
+ }
+
+ private static void log(String message) {
+ System.err.println(message);
+ }
+
+ // If the result indicates that we have outstanding tasks to do,
+ // go ahead and run them in this thread.
+ private static void runDelegatedTasks(SSLEngine engine) throws Exception {
+ if (engine.getHandshakeStatus() == HandshakeStatus.NEED_TASK) {
+ Runnable runnable;
+ while ((runnable = engine.getDelegatedTask()) != null) {
+ log(" running delegated task...");
+ runnable.run();
+ }
+ HandshakeStatus hsStatus = engine.getHandshakeStatus();
+ if (hsStatus == HandshakeStatus.NEED_TASK) {
+ throw new Exception(
+ "handshake shouldn't need additional tasks");
+ }
+ logEngineStatus(engine);
+ }
+ }
+
+ // Simple check to make sure everything came across as expected.
+ private static void checkTransfer(ByteBuffer a, ByteBuffer b)
+ throws Exception {
+ a.flip();
+ b.flip();
+
+ if (!a.equals(b)) {
+ throw new Exception("Data didn't transfer cleanly");
+ } else {
+ log("\tData transferred cleanly");
+ }
+
+ a.position(a.limit());
+ b.position(b.limit());
+ a.limit(a.capacity());
+ b.limit(b.capacity());
+ }
+}