Release XLT 9.1.2

Author: jowerner

config/testreport/js/xlt.js

@@ -39,8 +39,7 @@
 
     // the filter function, returns true if the value is to be shown
     function doFilter(value, filterPhrase) {
-        // request table cells contain the URLs as well, so cut them off
-        value = value.trim().split('\n')[0];
+        value = value.trim();
 
         // split filter phrase into filters
         var filters = filterPhrase.split('|');
@@ -455,6 +454,19 @@
 
         // setup the tables
         (function setupTables() {
+            // patch the Table plugin to ignore cluetip text content (e.g. distinct URLs) when filtering and sorting
+            const tableGetCellValue = Table.getCellValue;
+            Table.getCellValue = function() {
+                const node = arguments[0];
+                // don't let element nodes having CSS class 'cluetip-data' contribute any text to computed table cell value
+                if (node && node.nodeType === Node.ELEMENT_NODE && node.classList.contains("cluetip-data")) {
+                    return "";
+                }
+                // invoke the original function
+                return tableGetCellValue.apply(Table, arguments);
+            };
+
+            // now set up the tables
             Table.auto();
 
             // hide loader and show content after HTML for table is build (only if present)

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.xceptance</groupId>
     <artifactId>xlt</artifactId>
-    <version>9.1.1</version>
+    <version>9.1.2</version>
     <packaging>jar</packaging>
 
     <name>XLT</name>

src/main/java/com/xceptance/xlt/engine/htmlunit/okhttp3/CookieJarImpl.java

@@ -19,7 +19,6 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import org.apache.commons.lang3.StringUtils;
 import org.htmlunit.CookieManager;
 import org.htmlunit.util.Cookie;
 
@@ -32,6 +31,8 @@
  */
 class CookieJarImpl implements CookieJar
 {
+    static final String ERROR_MSG_COOKIE_INVALID = "Cookie not valid for use with OkHttp";
+
     /**
      * HtmlUnit's cookie manager.
      */
@@ -95,36 +96,55 @@ private static Cookie toHtmlUnitCookie(final okhttp3.Cookie okHttpCookie)
      *            the source cookie
      * @return the converted cookie
      */
-    private static okhttp3.Cookie toOkHttpCookie(final Cookie htmlUnitCookie)
+    static okhttp3.Cookie toOkHttpCookie(final Cookie htmlUnitCookie)
     {
-        final Builder builder = new okhttp3.Cookie.Builder();
-
-        builder.name(htmlUnitCookie.getName()).value(htmlUnitCookie.getValue()).path(htmlUnitCookie.getPath())
-               .expiresAt(htmlUnitCookie.getExpires().getTime());
-
-        final String domain = htmlUnitCookie.getDomain();
-        if (domain.startsWith("."))
-        {
-            // "wildcard" domain, such as ".example.com"
-            // the cookie builder expects the domain to be passed without the leading dot
-            builder.domain(StringUtils.stripStart(domain, "."));
-        }
-        else
+        try
         {
-            // "host" domain, such as "www.example.com"
-            builder.hostOnlyDomain(domain);
+            final Builder builder = new okhttp3.Cookie.Builder();
+
+            builder.name(htmlUnitCookie.getName());
+            builder.value(htmlUnitCookie.getValue());
+
+            final String domain = htmlUnitCookie.getDomain();
+            if (domain.startsWith("."))
+            {
+                // "wildcard" domain, such as ".example.com"
+                // the cookie builder expects the domain to be passed without the leading dot
+                builder.domain(domain.substring(1));
+            }
+            else
+            {
+                // "host" domain, such as "www.example.com"
+                builder.hostOnlyDomain(domain);
+            }
+
+            final String path = htmlUnitCookie.getPath();
+            if (path != null)
+            {
+                builder.path(path);
+            }
+
+            final Date expires = htmlUnitCookie.getExpires();
+            if (expires != null)
+            {
+                builder.expiresAt(expires.getTime());
+            }
+
+            if (htmlUnitCookie.isSecure())
+            {
+                builder.secure();
+            }
+
+            if (htmlUnitCookie.isHttpOnly())
+            {
+                builder.httpOnly();
+            }
+
+            return builder.build();
         }
-
-        if (htmlUnitCookie.isSecure())
+        catch (final Exception e)
         {
-            builder.secure();
+            throw new IllegalArgumentException(ERROR_MSG_COOKIE_INVALID + ": '" + htmlUnitCookie + "'", e);
         }
-
-        if (htmlUnitCookie.isHttpOnly())
-        {
-            builder.httpOnly();
-        }
-
-        return builder.build();
     }
 }

src/main/java/org/htmlunit/HttpWebConnection.java

@@ -118,7 +118,7 @@
 /**
  * Default implementation of {@link WebConnection}, using the HttpClient library to perform HTTP requests.
  *
- * @author <a href="mailto:mbowler@GargoyleSoftware.com">Mike Bowler</a>
+ * @author Mike Bowler
  * @author Noboru Sinohara
  * @author David D. Kilzer
  * @author Marc Guillemot
@@ -138,7 +138,7 @@ public class HttpWebConnection implements WebConnection {
     private static final String HACKED_COOKIE_POLICY = "mine";
 
     // have one per thread because this is (re)configured for every call (see configureHttpProcessorBuilder)
-    // do not use a ThreadLocal because this in only accessed form this class
+    // do not use a ThreadLocal because this in only accessed form this class, but we still need it synchronized
     private final Map<Thread, HttpClientBuilder> httpClientBuilder_ = new WeakHashMap<>();
     private final WebClient webClient_;
 
@@ -212,7 +212,9 @@ public WebResponse getResponse(final WebRequest webRequest) throws IOException {
                 // Calling code may catch the StackOverflowError, but due to the leak, the httpClient_ may
                 // come out of connections and throw a ConnectionPoolTimeoutException.
                 // => best solution, discard the HttpClient instance.
-                httpClientBuilder_.remove(Thread.currentThread());
+                synchronized (httpClientBuilder_) {
+                    httpClientBuilder_.remove(Thread.currentThread());
+                }
                 throw e;
             }
         }
@@ -427,7 +429,8 @@ private static Charset getCharset(final Charset charset, final List<NameValuePai
                 final KeyDataPair pairWithFile = (KeyDataPair) pair;
                 if (pairWithFile.getData() == null && pairWithFile.getFile() != null) {
                     final String fileName = pairWithFile.getFile().getName();
-                    for (int i = 0; i < fileName.length(); i++) {
+                    final int length = fileName.length();
+                    for (int i = 0; i < length; i++) {
                         if (fileName.codePointAt(i) > 127) {
                             return charset;
                         }
@@ -532,23 +535,26 @@ protected HttpRequestBase buildHttpMethod(final HttpMethod submitMethod, final U
      */
     protected HttpClientBuilder getHttpClientBuilder() {
         final Thread currentThread = Thread.currentThread();
-        HttpClientBuilder builder = httpClientBuilder_.get(currentThread);
-        if (builder == null) {
-            builder = createHttpClientBuilder();
 
-            // this factory is required later
-            // to be sure this is done, we do it outside the createHttpClient() call
-            final RegistryBuilder<CookieSpecProvider> registeryBuilder
-                = RegistryBuilder.<CookieSpecProvider>create()
-                            .register(HACKED_COOKIE_POLICY, htmlUnitCookieSpecProvider_);
-            builder.setDefaultCookieSpecRegistry(registeryBuilder.build());
+        synchronized (httpClientBuilder_) {
+            HttpClientBuilder builder = httpClientBuilder_.get(currentThread);
+            if (builder == null) {
+                builder = createHttpClientBuilder();
+
+                // this factory is required later
+                // to be sure this is done, we do it outside the createHttpClient() call
+                final RegistryBuilder<CookieSpecProvider> registeryBuilder
+                    = RegistryBuilder.<CookieSpecProvider>create()
+                                .register(HACKED_COOKIE_POLICY, htmlUnitCookieSpecProvider_);
+                builder.setDefaultCookieSpecRegistry(registeryBuilder.build());
+
+                builder.setDefaultCookieStore(new HtmlUnitCookieStore(webClient_.getCookieManager()));
+                builder.setUserAgent(webClient_.getBrowserVersion().getUserAgent());
+                httpClientBuilder_.put(currentThread, builder);
+            }
 
-            builder.setDefaultCookieStore(new HtmlUnitCookieStore(webClient_.getCookieManager()));
-            builder.setUserAgent(webClient_.getBrowserVersion().getUserAgent());
-            httpClientBuilder_.put(currentThread, builder);
+            return builder;
         }
-
-        return builder;
     }
 
     /**
@@ -1288,7 +1294,11 @@ public synchronized String toString() {
      */
     @Override
     public void close() {
-        httpClientBuilder_.clear();
+        synchronized (httpClientBuilder_) {
+            httpClientBuilder_.clear();
+        }
+        sharedAuthCache_.clear();
+        httpClientContextByThread_.clear();
 
         if (connectionManager_ != null) {
             connectionManager_.shutdown();