diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/H2AsyncClientBuilder.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/H2AsyncClientBuilder.java index 1e85bc955c..af40497019 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/H2AsyncClientBuilder.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/H2AsyncClientBuilder.java @@ -901,7 +901,7 @@ public CloseableHttpAsyncClient build() { .build(); } Lookup cookieSpecRegistryCopy = this.cookieSpecRegistry; - if (cookieSpecRegistryCopy == null) { + if (cookieSpecRegistryCopy == null && !cookieManagementDisabled) { cookieSpecRegistryCopy = CookieSpecSupport.createDefault(); } diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/HttpAsyncClientBuilder.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/HttpAsyncClientBuilder.java index 933b8ae781..d9cfbde3b9 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/HttpAsyncClientBuilder.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/HttpAsyncClientBuilder.java @@ -1118,7 +1118,7 @@ public CloseableHttpAsyncClient build() { .build(); } Lookup cookieSpecRegistryCopy = this.cookieSpecRegistry; - if (cookieSpecRegistryCopy == null) { + if (cookieSpecRegistryCopy == null && !cookieManagementDisabled) { cookieSpecRegistryCopy = CookieSpecSupport.createDefault(); } diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/HttpClientBuilder.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/HttpClientBuilder.java index 4ba68b9192..549f241398 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/HttpClientBuilder.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/HttpClientBuilder.java @@ -1066,7 +1066,7 @@ public CloseableHttpClient build() { .build(); } Lookup cookieSpecRegistryCopy = this.cookieSpecRegistry; - if (cookieSpecRegistryCopy == null) { + if (cookieSpecRegistryCopy == null && !this.cookieManagementDisabled) { cookieSpecRegistryCopy = CookieSpecSupport.createDefault(); } diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/examples/PublicSuffixLoaderBenchmark.java b/httpclient5/src/test/java/org/apache/hc/client5/http/examples/PublicSuffixLoaderBenchmark.java new file mode 100644 index 0000000000..a6a18a078e --- /dev/null +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/examples/PublicSuffixLoaderBenchmark.java @@ -0,0 +1,57 @@ +/* + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + * + * This software consists of voluntary contributions made by many + * individuals on behalf of the Apache Software Foundation. For more + * information on the Apache Software Foundation, please see + * . + * + */ + +package org.apache.hc.client5.http.examples; + +import org.apache.hc.client5.http.psl.PublicSuffixMatcherLoader; + +import static java.util.concurrent.TimeUnit.NANOSECONDS; + +public class PublicSuffixLoaderBenchmark { + public static void main(final String[] args) { + benchmarkGarbageCollection(); + loadPublicSuffixList(); + benchmarkGarbageCollection(); + } + + private static void loadPublicSuffixList() { + final long start = System.nanoTime(); + System.out.print("Loading public suffix list..."); + PublicSuffixMatcherLoader.getDefault(); + final long end = System.nanoTime(); + System.out.printf(" done (took %,d ms)%n", NANOSECONDS.toMillis(end - start)); + } + + private static void benchmarkGarbageCollection() { + for (int i = 0; i < 3; i++) { + final long start = System.nanoTime(); + System.gc(); + final long end = System.nanoTime(); + System.out.printf("GC took %,d ms%n", NANOSECONDS.toMillis(end - start)); + } + } +}