# HG changeset patch
# User chegar
# Date 1529515436 -3600
# Node ID 03ece25184286f6fb556b74bfc6787e5fa055815
# Parent  9dd879eefe33be740ee547a341b5150303535f2b# Parent  fba6889d5635d282f3e9ff32f545c9a732003151
http-client-branch: merge with default

diff -r 9dd879eefe33 -r 03ece2518428 src/hotspot/share/runtime/vm_version.cpp
--- a/src/hotspot/share/runtime/vm_version.cpp	Wed Jun 20 16:56:02 2018 +0100
+++ b/src/hotspot/share/runtime/vm_version.cpp	Wed Jun 20 18:23:56 2018 +0100
@@ -115,7 +115,7 @@
 
 const char* Abstract_VM_Version::vm_vendor() {
 #ifdef VENDOR
-  return XSTR(VENDOR);
+  return VENDOR;
 #else
   return "Oracle Corporation";
 #endif
diff -r 9dd879eefe33 -r 03ece2518428 src/java.net.http/share/classes/java/net/http/HttpClient.java
diff -r 9dd879eefe33 -r 03ece2518428 src/java.net.http/share/classes/java/net/http/HttpHeaders.java
diff -r 9dd879eefe33 -r 03ece2518428 src/java.net.http/share/classes/java/net/http/HttpRequest.java
diff -r 9dd879eefe33 -r 03ece2518428 src/java.net.http/share/classes/java/net/http/HttpResponse.java
diff -r 9dd879eefe33 -r 03ece2518428 src/java.net.http/share/classes/java/net/http/WebSocket.java
diff -r 9dd879eefe33 -r 03ece2518428 src/java.net.http/share/classes/java/net/http/WebSocketHandshakeException.java
diff -r 9dd879eefe33 -r 03ece2518428 src/java.net.http/share/classes/java/net/http/package-info.java
diff -r 9dd879eefe33 -r 03ece2518428 src/java.net.http/share/classes/jdk/internal/net/http/AuthenticationFilter.java
diff -r 9dd879eefe33 -r 03ece2518428 src/java.net.http/share/classes/jdk/internal/net/http/ConnectionPool.java
diff -r 9dd879eefe33 -r 03ece2518428 src/java.net.http/share/classes/jdk/internal/net/http/CookieFilter.java
diff -r 9dd879eefe33 -r 03ece2518428 src/java.net.http/share/classes/jdk/internal/net/http/Exchange.java
diff -r 9dd879eefe33 -r 03ece2518428 src/java.net.http/share/classes/jdk/internal/net/http/ExchangeImpl.java
diff -r 9dd879eefe33 -r 03ece2518428 src/java.net.http/share/classes/jdk/internal/net/http/Http1AsyncReceiver.java
diff -r 9dd879eefe33 -r 03ece2518428 src/java.net.http/share/classes/jdk/internal/net/http/Http1Exchange.java
diff -r 9dd879eefe33 -r 03ece2518428 src/java.net.http/share/classes/jdk/internal/net/http/Http1HeaderParser.java
diff -r 9dd879eefe33 -r 03ece2518428 src/java.net.http/share/classes/jdk/internal/net/http/Http1Request.java
diff -r 9dd879eefe33 -r 03ece2518428 src/java.net.http/share/classes/jdk/internal/net/http/Http1Response.java
diff -r 9dd879eefe33 -r 03ece2518428 src/java.net.http/share/classes/jdk/internal/net/http/Http2ClientImpl.java
diff -r 9dd879eefe33 -r 03ece2518428 src/java.net.http/share/classes/jdk/internal/net/http/Http2Connection.java
diff -r 9dd879eefe33 -r 03ece2518428 src/java.net.http/share/classes/jdk/internal/net/http/HttpClientImpl.java
diff -r 9dd879eefe33 -r 03ece2518428 src/java.net.http/share/classes/jdk/internal/net/http/HttpConnection.java
diff -r 9dd879eefe33 -r 03ece2518428 src/java.net.http/share/classes/jdk/internal/net/http/HttpRequestBuilderImpl.java
diff -r 9dd879eefe33 -r 03ece2518428 src/java.net.http/share/classes/jdk/internal/net/http/HttpRequestImpl.java
diff -r 9dd879eefe33 -r 03ece2518428 src/java.net.http/share/classes/jdk/internal/net/http/MultiExchange.java
diff -r 9dd879eefe33 -r 03ece2518428 src/java.net.http/share/classes/jdk/internal/net/http/PlainHttpConnection.java
diff -r 9dd879eefe33 -r 03ece2518428 src/java.net.http/share/classes/jdk/internal/net/http/RedirectFilter.java
diff -r 9dd879eefe33 -r 03ece2518428 src/java.net.http/share/classes/jdk/internal/net/http/Response.java
diff -r 9dd879eefe33 -r 03ece2518428 src/java.net.http/share/classes/jdk/internal/net/http/ResponseContent.java
diff -r 9dd879eefe33 -r 03ece2518428 src/java.net.http/share/classes/jdk/internal/net/http/SocketTube.java
diff -r 9dd879eefe33 -r 03ece2518428 src/java.net.http/share/classes/jdk/internal/net/http/Stream.java
diff -r 9dd879eefe33 -r 03ece2518428 src/java.net.http/share/classes/jdk/internal/net/http/common/ConnectionExpiredException.java
diff -r 9dd879eefe33 -r 03ece2518428 src/java.net.http/share/classes/jdk/internal/net/http/common/Log.java
diff -r 9dd879eefe33 -r 03ece2518428 src/java.net.http/share/classes/jdk/internal/net/http/common/SSLFlowDelegate.java
diff -r 9dd879eefe33 -r 03ece2518428 src/java.net.http/share/classes/jdk/internal/net/http/common/SSLTube.java
diff -r 9dd879eefe33 -r 03ece2518428 src/java.net.http/share/classes/jdk/internal/net/http/common/SubscriberWrapper.java
diff -r 9dd879eefe33 -r 03ece2518428 src/java.net.http/share/classes/jdk/internal/net/http/common/Utils.java
diff -r 9dd879eefe33 -r 03ece2518428 src/java.net.http/share/classes/jdk/internal/net/http/frame/SettingsFrame.java
diff -r 9dd879eefe33 -r 03ece2518428 src/java.net.http/share/classes/jdk/internal/net/http/hpack/Decoder.java
diff -r 9dd879eefe33 -r 03ece2518428 src/java.net.http/share/classes/jdk/internal/net/http/hpack/Encoder.java
diff -r 9dd879eefe33 -r 03ece2518428 src/java.net.http/share/classes/jdk/internal/net/http/hpack/HPACK.java
diff -r 9dd879eefe33 -r 03ece2518428 src/java.net.http/share/classes/jdk/internal/net/http/hpack/HeaderTable.java
diff -r 9dd879eefe33 -r 03ece2518428 src/java.net.http/share/classes/jdk/internal/net/http/hpack/ISO_8859_1.java
diff -r 9dd879eefe33 -r 03ece2518428 src/java.net.http/share/classes/jdk/internal/net/http/hpack/QuickHuffman.java
diff -r 9dd879eefe33 -r 03ece2518428 src/java.net.http/share/classes/jdk/internal/net/http/hpack/SimpleHeaderTable.java
diff -r 9dd879eefe33 -r 03ece2518428 src/java.net.http/share/classes/jdk/internal/net/http/websocket/OpeningHandshake.java
diff -r 9dd879eefe33 -r 03ece2518428 src/java.net.http/share/classes/jdk/internal/net/http/websocket/WebSocketImpl.java
diff -r 9dd879eefe33 -r 03ece2518428 test/hotspot/jtreg/runtime/SharedArchiveFile/BootAppendTests.java
--- a/test/hotspot/jtreg/runtime/SharedArchiveFile/BootAppendTests.java	Wed Jun 20 16:56:02 2018 +0100
+++ b/test/hotspot/jtreg/runtime/SharedArchiveFile/BootAppendTests.java	Wed Jun 20 18:23:56 2018 +0100
@@ -166,9 +166,10 @@
                            APP_CLASS, BOOT_APPEND_DUPLICATE_MODULE_CLASS_NAME);
 
             String MATCH_PATTERN = ".class.load. javax.annotation.processing.FilerException source:.*bootAppend.jar*";
-            OutputAnalyzer out = CDSTestUtils.runWithArchive(opts);
-            out.shouldHaveExitValue(0)
-                       .shouldNotMatch(MATCH_PATTERN);
+            CDSTestUtils.run(opts)
+                .assertNormalExit(out -> {
+                    out.shouldNotMatch(MATCH_PATTERN);
+                });
         }
     }
 
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/AbstractNoBody.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/AbstractThrowingPublishers.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/AbstractThrowingPushPromises.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/AbstractThrowingSubscribers.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/AsFileDownloadTest.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/BasicRedirectTest.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/BodyProcessorInputStreamTest.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/ConcurrentResponses.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/CookieHeaderTest.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/CustomRequestPublisher.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/CustomResponseSubscriber.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/DependentActionsTest.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/DependentPromiseActionsTest.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/DigestEchoServer.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/EncodedCharsInURI.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/EscapedOctetsInURI.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/FlowAdapterPublisherTest.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/FlowAdapterSubscriberTest.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/HandshakeFailureTest.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/HeadersTest.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/HttpClientBuilderTest.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/HttpHeadersOf.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/HttpInputStreamTest.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/HttpServerAdapters.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/ImmutableFlowItems.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/InvalidInputStreamSubscriptionRequest.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/InvalidSSLContextTest.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/InvalidSubscriptionRequest.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/LineBodyHandlerTest.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/MappingResponseSubscriber.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/MaxStreams.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/MethodsTest.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/RedirectMethodChange.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/RedirectWithCookie.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/RequestBuilderTest.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/ResponsePublisher.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/RetryWithCookie.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/ShortResponseBody.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/SpecialHeadersTest.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/SplitResponse.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/StreamingBody.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/UnauthorizedTest.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/examples/JavadocExamples.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/http2/BadHeadersTest.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/http2/BasicTest.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/http2/ContinuationFrameTest.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/http2/ErrorTest.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/http2/ImplicitPushCancel.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/http2/ServerPush.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/http2/ServerPushWithDiffTypes.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/HeaderTableTest.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/HuffmanTest.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/http2/server/Http2EchoHandler.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/http2/server/Http2RedirectHandler.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/http2/server/Http2TestExchange.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/http2/server/Http2TestExchangeImpl.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/http2/server/Http2TestExchangeSupplier.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/http2/server/Http2TestServer.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/http2/server/Http2TestServerConnection.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/http2/server/OutgoingPushPromise.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/http2/server/PushHandler.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/offline/OfflineTesting.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/ssltest/CertificateTest.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/websocket/MockListener.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/websocket/WebSocketTest.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/whitebox/ConnectionPoolTestDriver.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/AuthenticationFilterTest.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/ConnectionPoolTest.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/Http1HeaderParserTest.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/RawChannelTest.java
diff -r 9dd879eefe33 -r 03ece2518428 test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/SelectorTest.java