--- a/src/hotspot/share/classfile/verifier.cpp Thu Mar 28 13:47:40 2019 -0400
+++ b/src/hotspot/share/classfile/verifier.cpp Thu Mar 28 13:49:38 2019 -0400
@@ -574,7 +574,7 @@
ClassVerifier::ClassVerifier(
InstanceKlass* klass, TRAPS)
: _thread(THREAD), _previous_symbol(NULL), _symbols(NULL), _exception_type(NULL),
- _message(NULL), _klass(klass) {
+ _message(NULL), _method_signatures_table(NULL), _klass(klass) {
_this_type = VerificationType::reference_type(klass->name());
}
@@ -601,6 +601,13 @@
void ClassVerifier::verify_class(TRAPS) {
log_info(verification)("Verifying class %s with new format", _klass->external_name());
+ // Either verifying both local and remote classes or just remote classes.
+ assert(BytecodeVerificationRemote, "Should not be here");
+
+ // Create hash table containing method signatures.
+ method_signatures_table_type method_signatures_table;
+ set_method_signatures_table(&method_signatures_table);
+
Array<Method*>* methods = _klass->methods();
int num_methods = methods->length();
@@ -625,6 +632,55 @@
}
}
+// Translate the signature entries into verification types and save them in
+// the growable array. Also, save the count of arguments.
+void ClassVerifier::translate_signature(Symbol* const method_sig,
+ sig_as_verification_types* sig_verif_types,
+ TRAPS) {
+ SignatureStream sig_stream(method_sig);
+ VerificationType sig_type[2];
+ int sig_i = 0;
+ GrowableArray<VerificationType>* verif_types = sig_verif_types->sig_verif_types();
+
+ // Translate the signature arguments into verification types.
+ while (!sig_stream.at_return_type()) {
+ int n = change_sig_to_verificationType(&sig_stream, sig_type, CHECK_VERIFY(this));
+ assert(n <= 2, "Unexpected signature type");
+
+ // Store verification type(s). Longs and Doubles each have two verificationTypes.
+ for (int x = 0; x < n; x++) {
+ verif_types->push(sig_type[x]);
+ }
+ sig_i += n;
+ sig_stream.next();
+ }
+
+ // Set final arg count, not including the return type. The final arg count will
+ // be compared with sig_verify_types' length to see if there is a return type.
+ sig_verif_types->set_num_args(sig_i);
+
+ // Store verification type(s) for the return type, if there is one.
+ if (sig_stream.type() != T_VOID) {
+ int n = change_sig_to_verificationType(&sig_stream, sig_type, CHECK_VERIFY(this));
+ assert(n <= 2, "Unexpected signature return type");
+ for (int y = 0; y < n; y++) {
+ verif_types->push(sig_type[y]);
+ }
+ }
+}
+
+void ClassVerifier::create_method_sig_entry(sig_as_verification_types* sig_verif_types,
+ int sig_index, TRAPS) {
+ // Translate the signature into verification types.
+ ConstantPool* cp = _klass->constants();
+ Symbol* const method_sig = cp->symbol_at(sig_index);
+ translate_signature(method_sig, sig_verif_types, CHECK_VERIFY(this));
+
+ // Add the list of this signature's verification types to the table.
+ bool is_unique = method_signatures_table()->put(sig_index, sig_verif_types);
+ assert(is_unique, "Duplicate entries in method_signature_table");
+}
+
void ClassVerifier::verify_method(const methodHandle& m, TRAPS) {
HandleMark hm(THREAD);
_method = m; // initialize _method
@@ -2734,44 +2790,28 @@
ref_class_type = cp_ref_index_to_type(index, cp, CHECK_VERIFY(this));
}
- // For a small signature length, we just allocate 128 bytes instead
- // of parsing the signature once to find its size.
- // -3 is for '(', ')' and return descriptor; multiply by 2 is for
- // longs/doubles to be consertive.
assert(sizeof(VerificationType) == sizeof(uintptr_t),
"buffer type must match VerificationType size");
- uintptr_t on_stack_sig_types_buffer[128];
- // If we make a VerificationType[128] array directly, the compiler calls
- // to the c-runtime library to do the allocation instead of just
- // stack allocating it. Plus it would run constructors. This shows up
- // in performance profiles.
+
+ // Get the UTF8 index for this signature.
+ int sig_index = cp->signature_ref_index_at(cp->name_and_type_ref_index_at(index));
- VerificationType* sig_types;
- int size = (method_sig->utf8_length() - 3) * 2;
- if (size > 128) {
- // Long and double occupies two slots here.
- ArgumentSizeComputer size_it(method_sig);
- size = size_it.size();
- sig_types = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, VerificationType, size);
- } else{
- sig_types = (VerificationType*)on_stack_sig_types_buffer;
+ // Get the signature's verification types.
+ sig_as_verification_types* mth_sig_verif_types;
+ sig_as_verification_types** mth_sig_verif_types_ptr = method_signatures_table()->get(sig_index);
+ if (mth_sig_verif_types_ptr != NULL) {
+ // Found the entry for the signature's verification types in the hash table.
+ mth_sig_verif_types = *mth_sig_verif_types_ptr;
+ assert(mth_sig_verif_types != NULL, "Unexpected NULL sig_as_verification_types value");
+ } else {
+ // Not found, add the entry to the table.
+ GrowableArray<VerificationType>* verif_types = new GrowableArray<VerificationType>(10);
+ mth_sig_verif_types = new sig_as_verification_types(verif_types);
+ create_method_sig_entry(mth_sig_verif_types, sig_index, CHECK_VERIFY(this));
}
- SignatureStream sig_stream(method_sig);
- int sig_i = 0;
- while (!sig_stream.at_return_type()) {
- sig_i += change_sig_to_verificationType(
- &sig_stream, &sig_types[sig_i], CHECK_VERIFY(this));
- sig_stream.next();
- }
- int nargs = sig_i;
-#ifdef ASSERT
- {
- ArgumentSizeComputer size_it(method_sig);
- assert(nargs == size_it.size(), "Argument sizes do not match");
- assert(nargs <= (method_sig->utf8_length() - 3) * 2, "estimate of max size isn't conservative enough");
- }
-#endif
+ // Get the number of arguments for this signature.
+ int nargs = mth_sig_verif_types->num_args();
// Check instruction operands
u2 bci = bcs->bci();
@@ -2844,10 +2884,16 @@
}
}
+
+ // Get the verification types for the method's arguments.
+ GrowableArray<VerificationType>* sig_verif_types = mth_sig_verif_types->sig_verif_types();
+ assert(sig_verif_types != NULL, "Missing signature's array of verification types");
// Match method descriptor with operand stack
- for (int i = nargs - 1; i >= 0; i--) { // Run backwards
- current_frame->pop_stack(sig_types[i], CHECK_VERIFY(this));
+ // The arguments are on the stack in descending order.
+ for (int i = nargs - 1; i >= 0; i--) { // Run backwards
+ current_frame->pop_stack(sig_verif_types->at(i), CHECK_VERIFY(this));
}
+
// Check objectref on operand stack
if (opcode != Bytecodes::_invokestatic &&
opcode != Bytecodes::_invokedynamic) {
@@ -2919,7 +2965,8 @@
}
}
// Push the result type.
- if (sig_stream.type() != T_VOID) {
+ int sig_verif_types_len = sig_verif_types->length();
+ if (sig_verif_types_len > nargs) { // There's a return type
if (method_name == vmSymbols::object_initializer_name()) {
// <init> method must have a void return type
/* Unreachable? Class file parser verifies that methods with '<' have
@@ -2928,11 +2975,13 @@
"Return type must be void in <init> method");
return;
}
- VerificationType return_type[2];
- int n = change_sig_to_verificationType(
- &sig_stream, return_type, CHECK_VERIFY(this));
- for (int i = 0; i < n; i++) {
- current_frame->push_stack(return_type[i], CHECK_VERIFY(this)); // push types backwards
+
+ assert(sig_verif_types_len <= nargs + 2,
+ "Signature verification types array return type is bogus");
+ for (int i = nargs; i < sig_verif_types_len; i++) {
+ assert(i == nargs || sig_verif_types->at(i).is_long2() ||
+ sig_verif_types->at(i).is_double2(), "Unexpected return verificationType");
+ current_frame->push_stack(sig_verif_types->at(i), CHECK_VERIFY(this));
}
}
}
--- a/src/hotspot/share/classfile/verifier.hpp Thu Mar 28 13:47:40 2019 -0400
+++ b/src/hotspot/share/classfile/verifier.hpp Thu Mar 28 13:49:38 2019 -0400
@@ -31,6 +31,7 @@
#include "runtime/handles.hpp"
#include "utilities/exceptions.hpp"
#include "utilities/growableArray.hpp"
+#include "utilities/resourceHash.hpp"
// The verifier class
class Verifier : AllStatic {
@@ -246,6 +247,33 @@
void stackmap_details(outputStream* ss, const Method* method) const;
};
+class sig_as_verification_types : public ResourceObj {
+ private:
+ int _num_args; // Number of arguments, not including return type.
+ GrowableArray<VerificationType>* _sig_verif_types;
+
+ public:
+
+ sig_as_verification_types(GrowableArray<VerificationType>* sig_verif_types) :
+ _num_args(0), _sig_verif_types(sig_verif_types) {
+ }
+
+ int num_args() const { return _num_args; }
+ void set_num_args(int num_args) { _num_args = num_args; }
+
+ GrowableArray<VerificationType>* sig_verif_types() { return _sig_verif_types; }
+ void set_sig_verif_types(GrowableArray<VerificationType>* sig_verif_types) {
+ _sig_verif_types = sig_verif_types;
+ }
+
+};
+
+// This hashtable is indexed by the Utf8 constant pool indexes pointed to
+// by constant pool (Interface)Method_refs' NameAndType signature entries.
+typedef ResourceHashtable<int, sig_as_verification_types*,
+ primitive_hash<int>, primitive_equals<int>, 1007>
+ method_signatures_table_type;
+
// A new instance of this class is created for each class being verified
class ClassVerifier : public StackObj {
private:
@@ -257,6 +285,8 @@
Symbol* _exception_type;
char* _message;
+ method_signatures_table_type* _method_signatures_table;
+
ErrorContext _error_context; // contains information about an error
void verify_method(const methodHandle& method, TRAPS);
@@ -383,6 +413,13 @@
// the message_buffer will be filled in with the exception message.
void verify_class(TRAPS);
+ // Translates method signature entries into verificationTypes and saves them
+ // in the growable array.
+ void translate_signature(Symbol* const method_sig, sig_as_verification_types* sig_verif_types, TRAPS);
+
+ // Initializes a sig_as_verification_types entry and puts it in the hash table.
+ void create_method_sig_entry(sig_as_verification_types* sig_verif_types, int sig_index, TRAPS);
+
// Return status modes
Symbol* result() const { return _exception_type; }
bool has_error() const { return result() != NULL; }
@@ -400,6 +437,14 @@
Klass* load_class(Symbol* name, TRAPS);
+ method_signatures_table_type* method_signatures_table() const {
+ return _method_signatures_table;
+ }
+
+ void set_method_signatures_table(method_signatures_table_type* method_signatures_table) {
+ _method_signatures_table = method_signatures_table;
+ }
+
int change_sig_to_verificationType(
SignatureStream* sig_type, VerificationType* inference_type, TRAPS);
--- a/src/hotspot/share/code/nmethod.cpp Thu Mar 28 13:47:40 2019 -0400
+++ b/src/hotspot/share/code/nmethod.cpp Thu Mar 28 13:49:38 2019 -0400
@@ -1089,7 +1089,6 @@
if (_method->code() == this) {
_method->clear_code(); // Break a cycle
}
- _method = NULL; // Clear the method of this dead nmethod
}
// Make the class unloaded - i.e., change state and notify sweeper
@@ -1109,6 +1108,9 @@
Universe::heap()->unregister_nmethod(this);
}
+ // Clear the method of this dead nmethod
+ set_method(NULL);
+
// Log the unloading.
log_state_change();
--- a/src/java.base/share/classes/java/io/DataOutputStream.java Thu Mar 28 13:47:40 2019 -0400
+++ b/src/java.base/share/classes/java/io/DataOutputStream.java Thu Mar 28 13:49:38 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1994, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 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
@@ -317,7 +317,10 @@
* thrice the length of <code>str</code>.
*
* @param str a string to be written.
- * @exception IOException if an I/O error occurs.
+ * @throws UTFDataFormatException if the modified UTF-8 encoding of
+ * {@code str} would exceed 65535 bytes in length
+ * @throws IOException if some other I/O error occurs.
+ * @see #writeChars(String)
*/
public final void writeUTF(String str) throws IOException {
writeUTF(str, this);
@@ -341,55 +344,49 @@
* @param str a string to be written.
* @param out destination to write to
* @return The number of bytes written out.
- * @exception IOException if an I/O error occurs.
+ * @throws UTFDataFormatException if the modified UTF-8 encoding of
+ * {@code str} would exceed 65535 bytes in length
+ * @throws IOException if some other I/O error occurs.
*/
static int writeUTF(String str, DataOutput out) throws IOException {
- int strlen = str.length();
- int utflen = 0;
- int c, count = 0;
+ final int strlen = str.length();
+ int utflen = strlen; // optimized for ASCII
- /* use charAt instead of copying String to char array */
for (int i = 0; i < strlen; i++) {
- c = str.charAt(i);
- if ((c >= 0x0001) && (c <= 0x007F)) {
- utflen++;
- } else if (c > 0x07FF) {
- utflen += 3;
- } else {
- utflen += 2;
- }
+ int c = str.charAt(i);
+ if (c >= 0x80 || c == 0)
+ utflen += (c >= 0x800) ? 2 : 1;
}
- if (utflen > 65535)
- throw new UTFDataFormatException(
- "encoded string too long: " + utflen + " bytes");
+ if (utflen > 65535 || /* overflow */ utflen < strlen)
+ throw new UTFDataFormatException(tooLongMsg(str, utflen));
- byte[] bytearr = null;
+ final byte[] bytearr;
if (out instanceof DataOutputStream) {
DataOutputStream dos = (DataOutputStream)out;
- if(dos.bytearr == null || (dos.bytearr.length < (utflen+2)))
+ if (dos.bytearr == null || (dos.bytearr.length < (utflen + 2)))
dos.bytearr = new byte[(utflen*2) + 2];
bytearr = dos.bytearr;
} else {
- bytearr = new byte[utflen+2];
+ bytearr = new byte[utflen + 2];
}
+ int count = 0;
bytearr[count++] = (byte) ((utflen >>> 8) & 0xFF);
bytearr[count++] = (byte) ((utflen >>> 0) & 0xFF);
- int i=0;
- for (i=0; i<strlen; i++) {
- c = str.charAt(i);
- if (!((c >= 0x0001) && (c <= 0x007F))) break;
- bytearr[count++] = (byte) c;
+ int i = 0;
+ for (i = 0; i < strlen; i++) { // optimized for initial run of ASCII
+ int c = str.charAt(i);
+ if (c >= 0x80 || c == 0) break;
+ bytearr[count++] = (byte) c;
}
- for (;i < strlen; i++){
- c = str.charAt(i);
- if ((c >= 0x0001) && (c <= 0x007F)) {
+ for (; i < strlen; i++) {
+ int c = str.charAt(i);
+ if (c < 0x80 && c != 0) {
bytearr[count++] = (byte) c;
-
- } else if (c > 0x07FF) {
+ } else if (c >= 0x800) {
bytearr[count++] = (byte) (0xE0 | ((c >> 12) & 0x0F));
bytearr[count++] = (byte) (0x80 | ((c >> 6) & 0x3F));
bytearr[count++] = (byte) (0x80 | ((c >> 0) & 0x3F));
@@ -398,10 +395,20 @@
bytearr[count++] = (byte) (0x80 | ((c >> 0) & 0x3F));
}
}
- out.write(bytearr, 0, utflen+2);
+ out.write(bytearr, 0, utflen + 2);
return utflen + 2;
}
+ private static String tooLongMsg(String s, int bits32) {
+ int slen = s.length();
+ String head = s.substring(0, 8);
+ String tail = s.substring(slen - 8, slen);
+ // handle int overflow with max 3x expansion
+ long actualLength = (long)slen + Integer.toUnsignedLong(bits32 - slen);
+ return "encoded string (" + head + "..." + tail + ") too long: "
+ + actualLength + " bytes";
+ }
+
/**
* Returns the current value of the counter <code>written</code>,
* the number of bytes written to this data output stream so far.
--- a/src/java.base/windows/native/libnio/ch/FileChannelImpl.c Thu Mar 28 13:47:40 2019 -0400
+++ b/src/java.base/windows/native/libnio/ch/FileChannelImpl.c Thu Mar 28 13:49:38 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
--- a/src/java.desktop/unix/native/libawt_xawt/awt/awt_GraphicsEnv.c Thu Mar 28 13:47:40 2019 -0400
+++ b/src/java.desktop/unix/native/libawt_xawt/awt/awt_GraphicsEnv.c Thu Mar 28 13:49:38 2019 -0400
@@ -122,7 +122,11 @@
*/
#define MAXFRAMEBUFFERS 16
-#if defined(__linux__) || defined(MACOSX)
+#if defined(__solaris__)
+typedef Status XineramaGetInfoFunc(Display* display, int screen_number,
+ XRectangle* framebuffer_rects, unsigned char* framebuffer_hints,
+ int* num_framebuffers);
+#else /* Linux, Mac, AIX */
typedef struct {
int screen_number;
short x_org;
@@ -132,11 +136,6 @@
} XineramaScreenInfo;
typedef XineramaScreenInfo* XineramaQueryScreensFunc(Display*, int*);
-
-#else /* SOLARIS */
-typedef Status XineramaGetInfoFunc(Display* display, int screen_number,
- XRectangle* framebuffer_rects, unsigned char* framebuffer_hints,
- int* num_framebuffers);
#endif
Bool usingXinerama = False;
@@ -425,6 +424,7 @@
if (XQueryExtension(awt_display, "RENDER",
&major_opcode, &first_event, &first_error))
{
+ DTRACE_PRINTLN("RENDER extension available");
xrenderLibHandle = dlopen("libXrender.so.1", RTLD_LAZY | RTLD_GLOBAL);
#ifdef MACOSX
@@ -438,18 +438,30 @@
RTLD_LAZY | RTLD_GLOBAL);
}
-#ifndef __linux__ /* SOLARIS */
+#if defined(__solaris__)
if (xrenderLibHandle == NULL) {
xrenderLibHandle = dlopen("/usr/lib/libXrender.so.1",
RTLD_LAZY | RTLD_GLOBAL);
}
+#elif defined(_AIX)
+ if (xrenderLibHandle == NULL) {
+ xrenderLibHandle = dlopen("libXrender.a(libXrender.so.0)",
+ RTLD_MEMBER | RTLD_LAZY | RTLD_GLOBAL);
+ }
#endif
-
if (xrenderLibHandle != NULL) {
+ DTRACE_PRINTLN("Loaded libXrender");
xrenderFindVisualFormat =
(XRenderFindVisualFormatFunc*)dlsym(xrenderLibHandle,
"XRenderFindVisualFormat");
+ if (xrenderFindVisualFormat == NULL) {
+ DTRACE_PRINTLN1("Can't find 'XRenderFindVisualFormat' in libXrender (%s)", dlerror());
+ }
+ } else {
+ DTRACE_PRINTLN1("Can't load libXrender (%s)", dlerror());
}
+ } else {
+ DTRACE_PRINTLN("RENDER extension NOT available");
}
for (i = 0; i < nTrue; i++) {
@@ -465,18 +477,23 @@
graphicsConfigs [ind]->awt_depth = pVITrue [i].depth;
memcpy (&graphicsConfigs [ind]->awt_visInfo, &pVITrue [i],
sizeof (XVisualInfo));
- if (xrenderFindVisualFormat != NULL) {
+ if (xrenderFindVisualFormat != NULL) {
XRenderPictFormat *format = xrenderFindVisualFormat (awt_display,
- pVITrue [i].visual);
+ pVITrue [i].visual);
if (format &&
format->type == PictTypeDirect &&
format->direct.alphaMask)
{
+ DTRACE_PRINTLN1("GraphicsConfig[%d] supports Translucency", ind);
graphicsConfigs [ind]->isTranslucencySupported = 1;
memcpy(&graphicsConfigs [ind]->renderPictFormat, format,
sizeof(*format));
+ } else {
+ DTRACE_PRINTLN1(format ?
+ "GraphicsConfig[%d] has no Translucency support" :
+ "Error calling 'XRenderFindVisualFormat'", ind);
}
- }
+ }
}
if (xrenderLibHandle != NULL) {
@@ -582,7 +599,7 @@
}
#ifndef HEADLESS
-#if defined(__linux__) || defined(MACOSX)
+#if defined(__linux__) || defined(MACOSX) || defined(_AIX)
static void xinerama_init_linux()
{
void* libHandle = NULL;
@@ -595,14 +612,18 @@
libHandle = dlopen(VERSIONED_JNI_LIB_NAME("Xinerama", "1"),
RTLD_LAZY | RTLD_GLOBAL);
if (libHandle == NULL) {
+#if defined(_AIX)
+ libHandle = dlopen("libXext.a(shr_64.o)", RTLD_MEMBER | RTLD_LAZY | RTLD_GLOBAL);
+#else
libHandle = dlopen(JNI_LIB_NAME("Xinerama"), RTLD_LAZY | RTLD_GLOBAL);
+#endif
}
if (libHandle != NULL) {
XineramaQueryScreens = (XineramaQueryScreensFunc*)
dlsym(libHandle, XineramaQueryScreensName);
if (XineramaQueryScreens != NULL) {
- DTRACE_PRINTLN("calling XineramaQueryScreens func on Linux");
+ DTRACE_PRINTLN("calling XineramaQueryScreens func");
xinInfo = (*XineramaQueryScreens)(awt_display, &locNumScr);
if (xinInfo != NULL && locNumScr > XScreenCount(awt_display)) {
int32_t idx;
@@ -622,7 +643,10 @@
fbrects[idx].y = xinInfo[idx].y_org;
}
} else {
- DTRACE_PRINTLN("calling XineramaQueryScreens didn't work");
+ DTRACE_PRINTLN((xinInfo == NULL) ?
+ "calling XineramaQueryScreens didn't work" :
+ "XineramaQueryScreens <= XScreenCount"
+ );
}
} else {
DTRACE_PRINTLN("couldn't load XineramaQueryScreens symbol");
@@ -632,8 +656,7 @@
DTRACE_PRINTLN1("\ncouldn't open shared library: %s\n", dlerror());
}
}
-#endif
-#if !defined(__linux__) && !defined(MACOSX) /* Solaris */
+#elif defined(__solaris__)
static void xinerama_init_solaris()
{
void* libHandle = NULL;
@@ -689,11 +712,11 @@
}
DTRACE_PRINTLN("Xinerama extension is available");
-#if defined(__linux__) || defined(MACOSX)
+#if defined(__solaris__)
+ xinerama_init_solaris();
+#else /* Linux, Mac, AIX */
xinerama_init_linux();
-#else /* Solaris */
- xinerama_init_solaris();
-#endif /* __linux__ || MACOSX */
+#endif
}
#endif /* HEADLESS */
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationDayTimeImpl.java Thu Mar 28 13:47:40 2019 -0400
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationDayTimeImpl.java Thu Mar 28 13:49:38 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationYearMonthImpl.java Thu Mar 28 13:47:40 2019 -0400
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationYearMonthImpl.java Thu Mar 28 13:49:38 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
--- a/src/java.xml/share/classes/javax/xml/stream/XMLStreamException.java Thu Mar 28 13:47:40 2019 -0400
+++ b/src/java.xml/share/classes/javax/xml/stream/XMLStreamException.java Thu Mar 28 13:49:38 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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
--- a/test/hotspot/jtreg/compiler/codecache/stress/Helper.java Thu Mar 28 13:47:40 2019 -0400
+++ b/test/hotspot/jtreg/compiler/codecache/stress/Helper.java Thu Mar 28 13:49:38 2019 -0400
@@ -40,7 +40,7 @@
public static final Random RNG = Utils.getRandomInstance();
private static final long THRESHOLD = WHITE_BOX.getIntxVMFlag("CompileThreshold");
- private static final String TEST_CASE_IMPL_CLASS_NAME = "compiler.codecache.stress.Helper$TestCaseImpl";
+ private static final String TEST_CASE_IMPL_CLASS_NAME = "compiler.codecache.stress.TestCaseImpl";
private static byte[] CLASS_DATA;
static {
try {
@@ -109,34 +109,4 @@
int method();
int expectedValue();
}
-
- public static class TestCaseImpl implements TestCase {
- private static final int RETURN_VALUE = 42;
- private static final int RECURSION_DEPTH = 10;
- private volatile int i;
-
- @Override
- public Callable<Integer> getCallable() {
- return () -> {
- i = 0;
- return method();
- };
- }
-
- @Override
- public int method() {
- ++i;
- int result = RETURN_VALUE;
- if (i < RECURSION_DEPTH) {
- return result + method();
- }
- return result;
- }
-
- @Override
- public int expectedValue() {
- return RETURN_VALUE * RECURSION_DEPTH;
- }
- }
-
}
--- a/test/hotspot/jtreg/compiler/codecache/stress/RandomAllocationTest.java Thu Mar 28 13:47:40 2019 -0400
+++ b/test/hotspot/jtreg/compiler/codecache/stress/RandomAllocationTest.java Thu Mar 28 13:49:38 2019 -0400
@@ -29,7 +29,7 @@
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build sun.hotspot.WhiteBox
+ * @build sun.hotspot.WhiteBox compiler.codecache.stress.Helper compiler.codecache.stress.TestCaseImpl
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/test/hotspot/jtreg/compiler/codecache/stress/ReturnBlobToWrongHeapTest.java Thu Mar 28 13:47:40 2019 -0400
+++ b/test/hotspot/jtreg/compiler/codecache/stress/ReturnBlobToWrongHeapTest.java Thu Mar 28 13:49:38 2019 -0400
@@ -29,7 +29,7 @@
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build sun.hotspot.WhiteBox
+ * @build sun.hotspot.WhiteBox compiler.codecache.stress.Helper compiler.codecache.stress.TestCaseImpl
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/compiler/codecache/stress/TestCaseImpl.java Thu Mar 28 13:49:38 2019 -0400
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2014, 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.
+ */
+
+package compiler.codecache.stress;
+
+import java.util.concurrent.Callable;
+
+public class TestCaseImpl implements Helper.TestCase {
+ private static final int RETURN_VALUE = 42;
+ private static final int RECURSION_DEPTH = 10;
+ private volatile int i;
+
+ @Override
+ public Callable<Integer> getCallable() {
+ return () -> {
+ i = 0;
+ return method();
+ };
+ }
+
+ @Override
+ public int method() {
+ ++i;
+ int result = RETURN_VALUE;
+ if (i < RECURSION_DEPTH) {
+ return result + method();
+ }
+ return result;
+ }
+
+ @Override
+ public int expectedValue() {
+ return RETURN_VALUE * RECURSION_DEPTH;
+ }
+}
--- a/test/hotspot/jtreg/compiler/codecache/stress/UnexpectedDeoptimizationTest.java Thu Mar 28 13:47:40 2019 -0400
+++ b/test/hotspot/jtreg/compiler/codecache/stress/UnexpectedDeoptimizationTest.java Thu Mar 28 13:49:38 2019 -0400
@@ -29,7 +29,7 @@
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build sun.hotspot.WhiteBox
+ * @build sun.hotspot.WhiteBox compiler.codecache.stress.Helper compiler.codecache.stress.TestCaseImpl
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/test/hotspot/jtreg/runtime/containers/docker/DockerBasicTest.java Thu Mar 28 13:47:40 2019 -0400
+++ b/test/hotspot/jtreg/runtime/containers/docker/DockerBasicTest.java Thu Mar 28 13:49:38 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 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
@@ -33,6 +33,7 @@
* @build HelloDocker
* @run driver DockerBasicTest
*/
+import jdk.test.lib.containers.docker.Common;
import jdk.test.lib.containers.docker.DockerRunOptions;
import jdk.test.lib.containers.docker.DockerTestUtils;
import jdk.test.lib.Platform;
@@ -40,7 +41,7 @@
public class DockerBasicTest {
- private static final String imageNameAndTag = "jdk10-internal:test";
+ private static final String imageNameAndTag = Common.imageName("basic");
// Diganostics: set to false to examine image after the test
private static final boolean removeImageAfterTest = true;
--- a/test/jdk/com/sun/net/httpserver/TestLogging.java Thu Mar 28 13:47:40 2019 -0400
+++ b/test/jdk/com/sun/net/httpserver/TestLogging.java Thu Mar 28 13:49:38 2019 -0400
@@ -24,6 +24,7 @@
/**
* @test
* @bug 6422914
+ * @library /test/lib
* @summary change httpserver exception printouts
*/
@@ -37,6 +38,7 @@
import java.security.*;
import java.security.cert.*;
import javax.net.ssl.*;
+import jdk.test.lib.net.URIBuilder;
public class TestLogging extends Test {
@@ -63,13 +65,25 @@
int p1 = s1.getAddress().getPort();
- URL url = new URL ("http://127.0.0.1:"+p1+"/test1/smallfile.txt");
+ URL url = URIBuilder.newBuilder()
+ .scheme("http")
+ .loopback()
+ .port(p1)
+ .path("/test1/smallfile.txt")
+ .toURLUnchecked();
+ System.out.println("URL: " + url);
HttpURLConnection urlc = (HttpURLConnection)url.openConnection();
InputStream is = urlc.getInputStream();
while (is.read() != -1) ;
is.close();
- url = new URL ("http://127.0.0.1:"+p1+"/test1/doesntexist.txt");
+ url = URIBuilder.newBuilder()
+ .scheme("http")
+ .loopback()
+ .port(p1)
+ .path("/test1/doesntexist.txt")
+ .toURLUnchecked();
+ System.out.println("URL: " + url);
urlc = (HttpURLConnection)url.openConnection();
try {
is = urlc.getInputStream();
--- a/test/jdk/com/sun/net/httpserver/bugs/6725892/Test.java Thu Mar 28 13:47:40 2019 -0400
+++ b/test/jdk/com/sun/net/httpserver/bugs/6725892/Test.java Thu Mar 28 13:49:38 2019 -0400
@@ -24,6 +24,7 @@
/**
* @test
* @bug 6725892
+ * @library /test/lib
* @run main/othervm -Dsun.net.httpserver.maxReqTime=2 Test
* @summary
*/
@@ -36,6 +37,8 @@
import java.net.*;
import javax.net.ssl.*;
+import jdk.test.lib.net.URIBuilder;
+
public class Test {
static HttpServer s1;
@@ -76,7 +79,13 @@
port = s1.getAddress().getPort();
System.out.println ("Server on port " + port);
- url = new URL ("http://127.0.0.1:"+port+"/foo");
+ url = URIBuilder.newBuilder()
+ .scheme("http")
+ .loopback()
+ .port(port)
+ .path("/foo")
+ .toURLUnchecked();
+ System.out.println("URL: " + url);
test1();
test2();
test3();
--- a/test/jdk/com/sun/net/httpserver/bugs/B6373555.java Thu Mar 28 13:47:40 2019 -0400
+++ b/test/jdk/com/sun/net/httpserver/bugs/B6373555.java Thu Mar 28 13:49:38 2019 -0400
@@ -24,6 +24,7 @@
/**
* @test
* @bug 6373555
+ * @library /test/lib
* @summary HTTP Server failing to answer client requests
*/
@@ -32,6 +33,7 @@
import java.util.*;
import com.sun.net.httpserver.*;
import java.util.concurrent.*;
+import jdk.test.lib.net.URIBuilder;
public class B6373555 {
@@ -96,7 +98,13 @@
try {
Thread.sleep(10);
byte[] buf = getBuf();
- URL url = new URL("http://127.0.0.1:"+port+"/test");
+ URL url = URIBuilder.newBuilder()
+ .scheme("http")
+ .loopback()
+ .port(port)
+ .path("/test")
+ .toURLUnchecked();
+ System.out.println("URL: " + url);
HttpURLConnection con = (HttpURLConnection)url.openConnection();
con.setDoOutput(true);
con.setDoInput(true);
--- a/test/jdk/com/sun/net/httpserver/bugs/B6401598.java Thu Mar 28 13:47:40 2019 -0400
+++ b/test/jdk/com/sun/net/httpserver/bugs/B6401598.java Thu Mar 28 13:49:38 2019 -0400
@@ -23,6 +23,7 @@
/**
* @test
+ * @library /test/lib
* @bug 6401598
* @summary new HttpServer cannot serve binary stream data
*/
@@ -31,9 +32,12 @@
import java.net.HttpURLConnection;
import java.net.MalformedURLException;
import java.net.URL;
+import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.util.concurrent.*;
+import jdk.test.lib.net.URIBuilder;
+
import com.sun.net.httpserver.HttpExchange;
import com.sun.net.httpserver.HttpHandler;
import com.sun.net.httpserver.HttpServer;
@@ -90,7 +94,14 @@
short counter;
for (counter = 0; counter < 1000; counter++) {
- HttpURLConnection connection = getHttpURLConnection(new URL("http://127.0.0.1:"+port+"/server/"), 10000);
+ URL url = URIBuilder.newBuilder()
+ .scheme("http")
+ .loopback()
+ .port(port)
+ .path("/server/")
+ .toURLUnchecked();
+ System.out.println("URL: " + url);
+ HttpURLConnection connection = getHttpURLConnection(url, 10000);
OutputStream os = connection.getOutputStream();
--- a/test/jdk/java/io/DataOutputStream/WriteUTF.java Thu Mar 28 13:47:40 2019 -0400
+++ b/test/jdk/java/io/DataOutputStream/WriteUTF.java Thu Mar 28 13:49:38 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
@@ -22,14 +22,21 @@
*/
/* @test
- @bug 4260284
- @summary Test if DataOutputStream will overcount written field.
-*/
+ * @bug 4260284 8219196
+ * @summary Test if DataOutputStream will overcount written field.
+ * @run testng/othervm -Xmx2g WriteUTF
+ */
-import java.io.*;
+import java.io.ByteArrayOutputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.UTFDataFormatException;
+
+import org.testng.annotations.Test;
public class WriteUTF {
- public static void main(String[] args) throws Exception {
+ @Test
+ public static void overcountWrittenField() throws IOException {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
DataOutputStream dos = new DataOutputStream(baos);
dos.writeUTF("Hello, World!"); // 15
@@ -37,4 +44,25 @@
if (baos.size() != dos.size())
throw new RuntimeException("Miscounted bytes in DataOutputStream.");
}
+
+ private static void writeUTF(int size) throws IOException {
+ // this character gives 3 bytes when encoded using UTF-8
+ String s = "\u0800".repeat(size);
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ DataOutputStream dos = new DataOutputStream(bos);
+ dos.writeUTF(s);
+ }
+
+ @Test(expectedExceptions = UTFDataFormatException.class)
+ public void utfDataFormatException() throws IOException {
+ writeUTF(1 << 16);
+ }
+
+ // Without 8219196 fix, throws ArrayIndexOutOfBoundsException instead of
+ // expected UTFDataFormatException. Requires 2GB of heap (-Xmx2g) to run
+ // without throwing an OutOfMemoryError.
+ @Test(expectedExceptions = UTFDataFormatException.class)
+ public void arrayIndexOutOfBoundsException() throws IOException {
+ writeUTF(Integer.MAX_VALUE / 3 + 1);
+ }
}
--- a/test/jdk/java/net/HttpCookie/ExpiredCookieTest.java Thu Mar 28 13:47:40 2019 -0400
+++ b/test/jdk/java/net/HttpCookie/ExpiredCookieTest.java Thu Mar 28 13:49:38 2019 -0400
@@ -24,12 +24,14 @@
/*
* @test
* @bug 8000525
+ * @library /test/lib
*/
import java.net.*;
import java.util.*;
import java.io.*;
import java.text.*;
+import jdk.test.lib.net.URIBuilder;
public class ExpiredCookieTest {
// lifted from HttpCookie.java
@@ -81,7 +83,13 @@
"TEST4=TEST4; Path=/; Expires=" + datestring.toString());
header.put("Set-Cookie", values);
- cm.put(new URI("http://127.0.0.1/"), header);
+ URI uri = URIBuilder.newBuilder()
+ .scheme("http")
+ .loopback()
+ .path("/")
+ .buildUnchecked();
+ System.out.println("URI: " + uri);
+ cm.put(uri, header);
CookieStore cookieJar = cm.getCookieStore();
List <HttpCookie> cookies = cookieJar.getCookies();
--- a/test/jdk/java/net/HttpURLConnection/NoProxyTest.java Thu Mar 28 13:47:40 2019 -0400
+++ b/test/jdk/java/net/HttpURLConnection/NoProxyTest.java Thu Mar 28 13:49:38 2019 -0400
@@ -24,11 +24,13 @@
/*
* @test
* @bug 8144008
+ * @library /test/lib
* @summary Setting NO_PROXY on HTTP URL connections does not stop proxying
* @run main/othervm NoProxyTest
*/
import java.io.IOException;
+import java.net.InetAddress;
import java.net.MalformedURLException;
import java.net.Proxy;
import java.net.ProxySelector;
@@ -37,6 +39,7 @@
import java.net.URL;
import java.net.URLConnection;
import java.util.List;
+import jdk.test.lib.net.URIBuilder;
public class NoProxyTest {
@@ -52,7 +55,12 @@
public static void main(String args[]) throws MalformedURLException {
ProxySelector.setDefault(new NoProxyTestSelector());
- URL url = URI.create("http://127.0.0.1/").toURL();
+ URL url = URIBuilder.newBuilder()
+ .scheme("http")
+ .loopback()
+ .path("/")
+ .toURLUnchecked();
+ System.out.println("URL: " + url);
URLConnection connection;
try {
connection = url.openConnection(Proxy.NO_PROXY);
--- a/test/jdk/java/net/ProxySelector/NullSelector.java Thu Mar 28 13:47:40 2019 -0400
+++ b/test/jdk/java/net/ProxySelector/NullSelector.java Thu Mar 28 13:49:38 2019 -0400
@@ -23,15 +23,22 @@
/* @test
* @bug 6215885
+ * @library /test/lib
* @summary URLConnection.openConnection NPE if ProxySelector.setDefault is set to null
*/
import java.net.*;
import java.io.*;
+import jdk.test.lib.net.URIBuilder;
public class NullSelector {
public static void main(String[] args) throws Exception {
- URL url = new URL("http://127.0.0.1/");
+ URL url = URIBuilder.newBuilder()
+ .scheme("http")
+ .loopback()
+ .path("/")
+ .toURLUnchecked();
+ System.out.println("URL: " + url);
ProxySelector.setDefault(null);
URLConnection con = url.openConnection();
con.setConnectTimeout(500);
--- a/test/jdk/java/net/ResponseCache/Test2.java Thu Mar 28 13:47:40 2019 -0400
+++ b/test/jdk/java/net/ResponseCache/Test2.java Thu Mar 28 13:49:38 2019 -0400
@@ -24,6 +24,7 @@
/**
* @test
* @bug 8042622
+ * @library /test/lib
* @summary Check for CRL results in IllegalArgumentException "white space not allowed"
* @modules jdk.httpserver
* @run main/othervm Test2
@@ -38,6 +39,7 @@
import java.security.*;
import javax.security.auth.callback.*;
import javax.net.ssl.*;
+import jdk.test.lib.net.URIBuilder;
public class Test2 {
@@ -63,7 +65,7 @@
static int port;
- static String urlstring, redirstring;
+ static URL url, redir;
public static void main (String[] args) throws Exception {
Handler handler = new Handler();
@@ -78,10 +80,21 @@
server.setExecutor (executor);
server.start ();
- urlstring = "http://127.0.0.1:" + Integer.toString(port)+"/test/foo";
- redirstring = urlstring + "/redirect/bar";
+ url = URIBuilder.newBuilder()
+ .scheme("http")
+ .loopback()
+ .port(port)
+ .path("/test/foo")
+ .toURLUnchecked();
+ System.out.println("URL: " + url);
+ redir = URIBuilder.newBuilder()
+ .scheme("http")
+ .loopback()
+ .port(port)
+ .path("/test/foo/redirect/bar")
+ .toURLUnchecked();
+ System.out.println("Redir URL: " + redir);
- URL url = new URL (urlstring);
HttpURLConnection urlc = (HttpURLConnection)url.openConnection();
urlc.addRequestProperty("X-Foo", "bar");
urlc.setInstanceFollowRedirects(true);
@@ -114,7 +127,7 @@
Headers rmap = t.getResponseHeaders();
invocation ++;
if (invocation == 1) {
- rmap.add("Location", redirstring);
+ rmap.add("Location", redir.toString());
while (is.read () != -1) ;
is.close();
System.out.println ("sending response");
--- a/test/jdk/java/net/URLClassLoader/closetest/CloseTest.java Thu Mar 28 13:47:40 2019 -0400
+++ b/test/jdk/java/net/URLClassLoader/closetest/CloseTest.java Thu Mar 28 13:49:38 2019 -0400
@@ -42,6 +42,7 @@
import java.io.IOException;
import java.lang.reflect.Method;
import java.net.URLClassLoader;
+import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.URL;
import java.nio.file.Files;
@@ -49,6 +50,7 @@
import java.nio.file.Paths;
import jdk.test.lib.compiler.CompilerUtils;
+import jdk.test.lib.net.URIBuilder;
import jdk.test.lib.util.JarUtils;
import com.sun.net.httpserver.HttpContext;
@@ -157,8 +159,12 @@
static URL getServerURL() throws Exception {
int port = httpServer.getAddress().getPort();
- String s = "http://127.0.0.1:" + port + "/";
- return new URL(s);
+ return URIBuilder.newBuilder()
+ .scheme("http")
+ .loopback()
+ .port(port)
+ .path("/")
+ .toURL();
}
static void startHttpServer(String docroot) throws Exception {
--- a/test/jdk/java/net/URLConnection/TimeoutTest.java Thu Mar 28 13:47:40 2019 -0400
+++ b/test/jdk/java/net/URLConnection/TimeoutTest.java Thu Mar 28 13:49:38 2019 -0400
@@ -24,12 +24,14 @@
/*
* @test
* @bug 4389976
+ * @library /test/lib
* @summary can't unblock read() of InputStream from URL connection
* @run main/timeout=40/othervm -Dsun.net.client.defaultReadTimeout=2000 TimeoutTest
*/
import java.io.*;
import java.net.*;
+import jdk.test.lib.net.URIBuilder;
public class TimeoutTest {
@@ -68,7 +70,12 @@
ServerSocket ss = new ServerSocket(0);
Server s = new Server (ss);
try{
- URL url = new URL ("http://127.0.0.1:"+ss.getLocalPort());
+ URL url = URIBuilder.newBuilder()
+ .scheme("http")
+ .loopback()
+ .port(ss.getLocalPort())
+ .toURL();
+ System.out.println("URL: " + url);
URLConnection urlc = url.openConnection ();
InputStream is = urlc.getInputStream ();
throw new RuntimeException("Should have received timeout");
--- a/test/jdk/java/net/URLPermission/OpenURL.java Thu Mar 28 13:47:40 2019 -0400
+++ b/test/jdk/java/net/URLPermission/OpenURL.java Thu Mar 28 13:49:38 2019 -0400
@@ -24,11 +24,13 @@
/*
* @test
* @bug 8029354
+ * @library /test/lib
* @run main/othervm OpenURL
*/
import java.net.*;
import java.io.*;
+import jdk.test.lib.net.URIBuilder;
public class OpenURL {
@@ -37,7 +39,13 @@
System.setSecurityManager(new SecurityManager());
try {
- URL url = new URL ("http://joe@127.0.0.1/a/b");
+ URL url = URIBuilder.newBuilder()
+ .scheme("http")
+ .userInfo("joe")
+ .loopback()
+ .path("/a/b")
+ .toURL();
+ System.out.println("URL: " + url);
HttpURLConnection urlc = (HttpURLConnection)url.openConnection();
InputStream is = urlc.getInputStream();
// error will throw exception other than SecurityException
--- a/test/jdk/java/net/httpclient/AuthSchemesTest.java Thu Mar 28 13:47:40 2019 -0400
+++ b/test/jdk/java/net/httpclient/AuthSchemesTest.java Thu Mar 28 13:49:38 2019 -0400
@@ -24,6 +24,7 @@
/**
* @test
* @bug 8217237
+ * @library /test/lib
* @modules java.net.http
* @run main/othervm AuthSchemesTest
* @summary HttpClient does not deal well with multi-valued WWW-Authenticate challenge headers
@@ -37,6 +38,7 @@
import java.net.http.HttpClient;
import java.net.http.HttpRequest;
import java.net.http.HttpResponse;
+import jdk.test.lib.net.URIBuilder;
public class AuthSchemesTest {
static class BasicServer extends Thread {
@@ -142,7 +144,13 @@
.authenticator(authenticator)
.build();
server.start();
- URI uri = URI.create("http://127.0.0.1:" + port + "/foo");
+ URI uri = URIBuilder.newBuilder()
+ .scheme("http")
+ .loopback()
+ .port(port)
+ .path("/foo")
+ .build();
+ System.out.println("URI: " + uri);
HttpRequest request = HttpRequest.newBuilder(uri)
.GET()
.build();
--- a/test/jdk/java/net/httpclient/LargeResponseContent.java Thu Mar 28 13:47:40 2019 -0400
+++ b/test/jdk/java/net/httpclient/LargeResponseContent.java Thu Mar 28 13:49:38 2019 -0400
@@ -39,10 +39,12 @@
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionStage;
import java.util.concurrent.Flow;
+import jdk.test.lib.net.URIBuilder;
/**
* @test
* @bug 8212926
+ * @library /test/lib
* @summary Basic tests for response timeouts
* @run main/othervm LargeResponseContent
*/
@@ -60,7 +62,13 @@
}
void runClient() throws IOException, InterruptedException {
- URI uri = URI.create("http://127.0.0.1:" + Integer.toString(port) + "/foo");
+ URI uri = URIBuilder.newBuilder()
+ .scheme("http")
+ .loopback()
+ .port(port)
+ .path("/foo")
+ .buildUnchecked();
+ System.out.println("URI: " + uri);
HttpClient client = HttpClient.newHttpClient();
HttpRequest request = HttpRequest.newBuilder(uri)
.GET()
--- a/test/jdk/sun/net/www/http/KeepAliveCache/KeepAliveTimerThread.java Thu Mar 28 13:47:40 2019 -0400
+++ b/test/jdk/sun/net/www/http/KeepAliveCache/KeepAliveTimerThread.java Thu Mar 28 13:49:38 2019 -0400
@@ -23,24 +23,26 @@
/*
* @test
+ * @library /test/lib
* @bug 4701299
* @summary Keep-Alive-Timer thread management in KeepAliveCache causes memory leak
*/
+
import java.net.*;
import java.io.*;
+import jdk.test.lib.net.URIBuilder;
public class KeepAliveTimerThread {
static class Fetcher implements Runnable {
- String url;
+ URL url;
- Fetcher(String url) {
+ Fetcher(URL url) {
this.url = url;
}
public void run() {
try {
- InputStream in =
- (new URL(url)).openConnection().getInputStream();
+ InputStream in = url.openConnection().getInputStream();
byte b[] = new byte[128];
int n;
do {
@@ -105,7 +107,12 @@
Server s = new Server (ss);
s.start();
- String url = "http://127.0.0.1:"+ss.getLocalPort();
+ URL url = URIBuilder.newBuilder()
+ .scheme("http")
+ .loopback()
+ .port(ss.getLocalPort())
+ .toURL();
+ System.out.println("URL: " + url);
// start fetch in its own thread group
ThreadGroup grp = new ThreadGroup("MyGroup");
--- a/test/jdk/sun/net/www/protocol/http/6550798/test.java Thu Mar 28 13:47:40 2019 -0400
+++ b/test/jdk/sun/net/www/protocol/http/6550798/test.java Thu Mar 28 13:49:38 2019 -0400
@@ -24,6 +24,7 @@
/**
* @test
* @bug 6550798
+ * @library /test/lib
* @summary Using InputStream.skip with ResponseCache will cause partial data to be cached
* @modules jdk.httpserver
* @run main/othervm test
@@ -33,6 +34,8 @@
import com.sun.net.httpserver.*;
import java.io.*;
+import jdk.test.lib.net.URIBuilder;
+
public class test {
final static int LEN = 16 * 1024;
@@ -58,7 +61,13 @@
s.start();
System.out.println("http request with cache hander");
- URL u = new URL("http://127.0.0.1:"+s.getAddress().getPort()+"/f");
+ URL u = URIBuilder.newBuilder()
+ .scheme("http")
+ .loopback()
+ .port(s.getAddress().getPort())
+ .path("/f")
+ .toURL();
+ System.out.println("URL: " + u);
URLConnection conn = u.openConnection();
InputStream is = null;
--- a/test/jdk/sun/net/www/protocol/http/B6890349.java Thu Mar 28 13:47:40 2019 -0400
+++ b/test/jdk/sun/net/www/protocol/http/B6890349.java Thu Mar 28 13:49:38 2019 -0400
@@ -39,7 +39,11 @@
System.out.println ("listening on " + port);
B6890349 t = new B6890349 (server);
t.start();
- URL u = new URL ("http://127.0.0.1:"+port+"/foo\nbar");
+ URL u = new URL("http",
+ InetAddress.getLoopbackAddress().getHostAddress(),
+ port,
+ "/foo\nbar");
+ System.out.println("URL: " + u);
HttpURLConnection urlc = (HttpURLConnection)u.openConnection ();
InputStream is = urlc.getInputStream();
throw new RuntimeException ("Test failed");
--- a/test/jdk/sun/net/www/protocol/http/B8012625.java Thu Mar 28 13:47:40 2019 -0400
+++ b/test/jdk/sun/net/www/protocol/http/B8012625.java Thu Mar 28 13:49:38 2019 -0400
@@ -24,6 +24,7 @@
/**
* @test
* @bug 8012625
+ * @library /test/lib
* @modules jdk.httpserver
* @run main B8012625
*/
@@ -34,6 +35,9 @@
import java.net.*;
import java.io.*;
import java.util.concurrent.*;
+
+import jdk.test.lib.net.URIBuilder;
+
import com.sun.net.httpserver.*;
public class B8012625 implements HttpHandler {
@@ -44,8 +48,13 @@
}
public void run() throws Exception {
- String u = "http://127.0.0.1:" + port + "/foo";
- URL url = new URL(u);
+ URL url = URIBuilder.newBuilder()
+ .scheme("http")
+ .loopback()
+ .port(port)
+ .path("/foo")
+ .toURL();
+ System.out.println("URL: " + url);
HttpURLConnection uc = (HttpURLConnection)url.openConnection();
uc.setDoOutput(true);
uc.setRequestMethod("POST");
--- a/test/jdk/sun/net/www/protocol/http/NoNTLM.java Thu Mar 28 13:47:40 2019 -0400
+++ b/test/jdk/sun/net/www/protocol/http/NoNTLM.java Thu Mar 28 13:49:38 2019 -0400
@@ -23,6 +23,7 @@
/* @test
* @bug 8004502
+ * @library /test/lib
* @summary Sanity check that NTLM will not be selected by the http protocol
* handler when running on a profile that does not support NTLM
* @modules java.base/sun.net.www
@@ -34,11 +35,13 @@
import java.lang.reflect.Field;
import java.net.Authenticator;
import java.net.HttpURLConnection;
+import java.net.InetAddress;
import java.net.PasswordAuthentication;
import java.net.Proxy;
import java.net.ServerSocket;
import java.net.Socket;
import java.net.URL;
+import jdk.test.lib.net.URIBuilder;
import sun.net.www.MessageHeader;
public class NoNTLM {
@@ -57,7 +60,13 @@
private volatile int respCode;
Client(int port) throws IOException {
- this.url = new URL("http://127.0.0.1:" + port + "/foo.html");
+ this.url = URIBuilder.newBuilder()
+ .scheme("http")
+ .loopback()
+ .port(port)
+ .path("/foo.html")
+ .toURLUnchecked();
+ System.out.println("Client URL: " + this.url);
}
public void run() {
--- a/test/jdk/sun/net/www/protocol/http/RedirectOnPost.java Thu Mar 28 13:47:40 2019 -0400
+++ b/test/jdk/sun/net/www/protocol/http/RedirectOnPost.java Thu Mar 28 13:49:38 2019 -0400
@@ -39,6 +39,7 @@
import java.util.concurrent.*;
import javax.net.ssl.*;
import jdk.test.lib.net.SimpleSSLContext;
+import jdk.test.lib.net.URIBuilder;
public class RedirectOnPost {
@@ -55,8 +56,8 @@
int sslPort = httpsServer.getAddress().getPort();
httpServer.start();
httpsServer.start();
- runTest("http://127.0.0.1:"+port+"/test/", null);
- runTest("https://127.0.0.1:"+sslPort+"/test/", ctx);
+ runTest("http", port, null);
+ runTest("https", sslPort, ctx);
System.out.println("Main thread waiting");
} finally {
httpServer.stop(0);
@@ -65,10 +66,17 @@
}
}
- public static void runTest(String baseURL, SSLContext ctx) throws Exception
+ public static void runTest(String scheme, int port, SSLContext ctx) throws Exception
{
byte[] buf = "Hello world".getBytes();
- URL url = new URL(baseURL + "a");
+
+ URL url = URIBuilder.newBuilder()
+ .scheme(scheme)
+ .loopback()
+ .port(port)
+ .path("/test/a")
+ .toURL();
+ System.out.println("URL: " + url);
HttpURLConnection con = (HttpURLConnection)url.openConnection();
if (con instanceof HttpsURLConnection) {
HttpsURLConnection ssl = (HttpsURLConnection)con;
@@ -107,10 +115,12 @@
static class Handler implements HttpHandler {
- String baseURL;
+ String scheme;
+ int port;
- Handler(String baseURL) {
- this.baseURL = baseURL;
+ Handler(String scheme, int port) {
+ this.scheme = scheme;
+ this.port = port;
}
int calls = 0;
@@ -118,6 +128,12 @@
public void handle(HttpExchange msg) {
try {
String method = msg.getRequestMethod();
+ URL baseURL = URIBuilder.newBuilder()
+ .scheme(scheme)
+ .loopback()
+ .path("/test/b")
+ .port(port)
+ .toURLUnchecked();
System.out.println ("Server: " + baseURL);
if (calls++ == 0) {
System.out.println ("Server: redirecting");
@@ -125,7 +141,7 @@
byte[] buf = readFully(is);
is.close();
Headers h = msg.getResponseHeaders();
- h.add("Location", baseURL + "b");
+ h.add("Location", baseURL.toString());
msg.sendResponseHeaders(302, -1);
msg.close();
} else {
@@ -153,9 +169,9 @@
HttpServer testServer = HttpServer.create(inetAddress, 15);
int port = testServer.getAddress().getPort();
testServer.setExecutor(execs);
- String base = "http://127.0.0.1:"+port+"/test";
+
HttpContext context = testServer.createContext("/test");
- context.setHandler(new Handler(base));
+ context.setHandler(new Handler("http", port));
return testServer;
}
@@ -169,9 +185,9 @@
int port = testServer.getAddress().getPort();
testServer.setExecutor(execs);
testServer.setHttpsConfigurator(new HttpsConfigurator (ctx));
- String base = "https://127.0.0.1:"+port+"/test";
+
HttpContext context = testServer.createContext("/test");
- context.setHandler(new Handler(base));
+ context.setHandler(new Handler("https", port));
return testServer;
}
}
--- a/test/jdk/sun/net/www/protocol/http/ResponseCacheStream.java Thu Mar 28 13:47:40 2019 -0400
+++ b/test/jdk/sun/net/www/protocol/http/ResponseCacheStream.java Thu Mar 28 13:49:38 2019 -0400
@@ -24,6 +24,7 @@
/*
* @test
* @bug 6262486
+ * @library /test/lib
* @modules java.base/sun.net.www
* @library ../../httptest/
* @build HttpCallback TestHttpServer ClosedChannelList HttpTransaction
@@ -34,6 +35,7 @@
import java.net.*;
import java.io.*;
import java.util.*;
+import jdk.test.lib.net.URIBuilder;
public class ResponseCacheStream implements HttpCallback {
@@ -100,7 +102,12 @@
ResponseCache.setDefault(cache);
server = new TestHttpServer (new ResponseCacheStream());
System.out.println ("Server: listening on port: " + server.getLocalPort());
- URL url = new URL ("http://127.0.0.1:"+server.getLocalPort()+"/");
+ URL url = URIBuilder.newBuilder()
+ .scheme("http")
+ .loopback()
+ .port(server.getLocalPort())
+ .path("/")
+ .toURL();
System.out.println ("Client: connecting to " + url);
HttpURLConnection urlc = (HttpURLConnection)url.openConnection();
InputStream is = urlc.getInputStream();
--- a/test/jdk/sun/net/www/protocol/http/RetryUponTimeout.java Thu Mar 28 13:47:40 2019 -0400
+++ b/test/jdk/sun/net/www/protocol/http/RetryUponTimeout.java Thu Mar 28 13:49:38 2019 -0400
@@ -24,12 +24,14 @@
/**
* @test
* @bug 4772077
+ * @library /test/lib
* @summary using defaultReadTimeout appear to retry request upon timeout
* @modules java.base/sun.net.www
*/
import java.net.*;
import java.io.*;
+import jdk.test.lib.net.URIBuilder;
import sun.net.www.*;
public class RetryUponTimeout implements Runnable {
@@ -63,7 +65,12 @@
int port = server.getLocalPort ();
new Thread(new RetryUponTimeout()).start ();
- URL url = new URL("http://127.0.0.1:"+port);
+ URL url = URIBuilder.newBuilder()
+ .scheme("http")
+ .loopback()
+ .port(port)
+ .toURL();
+ System.out.println("URL: " + url);
java.net.URLConnection uc = url.openConnection();
uc.setReadTimeout(1000);
uc.getInputStream();
--- a/test/jdk/sun/net/www/protocol/http/SetChunkedStreamingMode.java Thu Mar 28 13:47:40 2019 -0400
+++ b/test/jdk/sun/net/www/protocol/http/SetChunkedStreamingMode.java Thu Mar 28 13:49:38 2019 -0400
@@ -26,6 +26,7 @@
* @bug 5049976
* @modules java.base/sun.net.www
* @library ../../httptest/
+ * @library /test/lib
* @build HttpCallback TestHttpServer ClosedChannelList HttpTransaction
* @run main SetChunkedStreamingMode
* @summary Unspecified NPE is thrown when streaming output mode is enabled
@@ -33,6 +34,7 @@
import java.io.*;
import java.net.*;
+import jdk.test.lib.net.URIBuilder;
public class SetChunkedStreamingMode implements HttpCallback {
@@ -67,7 +69,12 @@
try {
server = new TestHttpServer (new SetChunkedStreamingMode(), 1, 10, 0);
System.out.println ("Server: listening on port: " + server.getLocalPort());
- URL url = new URL ("http://127.0.0.1:"+server.getLocalPort()+"/");
+ URL url = URIBuilder.newBuilder()
+ .scheme("http")
+ .loopback()
+ .port(server.getLocalPort())
+ .path("/")
+ .toURL();
System.out.println ("Client: connecting to " + url);
HttpURLConnection urlc = (HttpURLConnection)url.openConnection();
urlc.setChunkedStreamingMode (0);
--- a/test/jdk/sun/net/www/protocol/http/UserAgent.java Thu Mar 28 13:47:40 2019 -0400
+++ b/test/jdk/sun/net/www/protocol/http/UserAgent.java Thu Mar 28 13:49:38 2019 -0400
@@ -24,6 +24,7 @@
/**
* @test
* @bug 4512200
+ * @library /test/lib
* @modules java.base/sun.net.www
* @run main/othervm -Dhttp.agent=foo UserAgent
* @summary HTTP header "User-Agent" format incorrect
@@ -32,6 +33,7 @@
import java.io.*;
import java.util.*;
import java.net.*;
+import jdk.test.lib.net.URIBuilder;
import sun.net.www.MessageHeader;
class Server extends Thread {
@@ -89,7 +91,12 @@
Server s = new Server (server);
s.start ();
int port = server.getLocalPort ();
- URL url = new URL ("http://127.0.0.1:"+port);
+ URL url = URIBuilder.newBuilder()
+ .scheme("http")
+ .loopback()
+ .port(port)
+ .toURL();
+ System.out.println("URL: " + url);
URLConnection urlc = url.openConnection ();
urlc.getInputStream ();
s.join ();
--- a/test/jdk/sun/net/www/protocol/https/HttpsURLConnection/IPAddressDNSIdentities.java Thu Mar 28 13:47:40 2019 -0400
+++ b/test/jdk/sun/net/www/protocol/https/HttpsURLConnection/IPAddressDNSIdentities.java Thu Mar 28 13:49:38 2019 -0400
@@ -23,6 +23,7 @@
/* @test
* @bug 6766775
+ * @library /test/lib
* @summary X509 certificate hostname checking is broken in JDK1.6.0_10
* @run main/othervm IPAddressDNSIdentities
*
@@ -42,6 +43,7 @@
import java.security.spec.*;
import java.security.interfaces.*;
import java.math.BigInteger;
+import jdk.test.lib.net.URIBuilder;
/*
* Certificates and key used in the test.
@@ -710,7 +712,12 @@
HttpsURLConnection http = null;
/* establish http connection to server */
- URL url = new URL("https://127.0.0.1:" + serverPort+"/");
+ URL url = URIBuilder.newBuilder()
+ .scheme("https")
+ .loopback()
+ .port(serverPort)
+ .path("/")
+ .toURL();
System.out.println("url is "+url.toString());
try {
--- a/test/jdk/sun/net/www/protocol/https/HttpsURLConnection/IPAddressIPIdentities.java Thu Mar 28 13:47:40 2019 -0400
+++ b/test/jdk/sun/net/www/protocol/https/HttpsURLConnection/IPAddressIPIdentities.java Thu Mar 28 13:49:38 2019 -0400
@@ -28,6 +28,7 @@
/* @test
* @summary X509 certificate hostname checking is broken in JDK1.6.0_10
+ * @library /test/lib
* @bug 6766775
* @run main/othervm IPAddressIPIdentities
* @author Xuelei Fan
@@ -45,6 +46,7 @@
import java.security.spec.*;
import java.security.interfaces.*;
import java.math.BigInteger;
+import jdk.test.lib.net.URIBuilder;
/*
* Certificates and key used in the test.
@@ -714,7 +716,12 @@
HttpsURLConnection http = null;
/* establish http connection to server */
- URL url = new URL("https://127.0.0.1:" + serverPort+"/");
+ URL url = URIBuilder.newBuilder()
+ .scheme("https")
+ .loopback()
+ .port(serverPort)
+ .path("/")
+ .toURL();
System.out.println("url is "+url.toString());
try {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/net/URIBuilder.java Thu Mar 28 13:49:38 2019 -0400
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, Google 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.
+ */
+
+package jdk.test.lib.net;
+
+import java.net.InetAddress;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+
+public class URIBuilder {
+
+ public static URIBuilder newBuilder() {
+ return new URIBuilder();
+ }
+
+ private String scheme;
+ private String userInfo;
+ private String host;
+ private int port;
+ private String path;
+ private String query;
+ private String fragment;
+
+ private URIBuilder() {}
+
+ public URIBuilder scheme(String scheme) {
+ this.scheme = scheme;
+ return this;
+ }
+
+ public URIBuilder userInfo(String userInfo) {
+ this.userInfo = userInfo;
+ return this;
+ }
+
+ public URIBuilder host(String host) {
+ this.host = host;
+ return this;
+ }
+
+ public URIBuilder loopback() {
+ return host(InetAddress.getLoopbackAddress().getHostAddress());
+ }
+
+ public URIBuilder port(int port) {
+ this.port = port;
+ return this;
+ }
+
+ public URIBuilder path(String path) {
+ this.path = path;
+ return this;
+ }
+
+ public URIBuilder query(String query) {
+ this.query = query;
+ return this;
+ }
+
+ public URIBuilder fragment(String fragment) {
+ this.fragment = fragment;
+ return this;
+ }
+
+ public URI build() throws URISyntaxException {
+ return new URI(scheme, userInfo, host, port, path, query, fragment);
+ }
+
+ public URI buildUnchecked() {
+ try {
+ return build();
+ } catch (URISyntaxException e) {
+ throw new IllegalArgumentException(e);
+ }
+ }
+
+ public URL toURL() throws URISyntaxException, MalformedURLException {
+ return build().toURL();
+ }
+
+ public URL toURLUnchecked() {
+ try {
+ return toURL();
+ } catch (URISyntaxException | MalformedURLException e) {
+ throw new IllegalArgumentException(e);
+ }
+ }
+}