8255124: KeepAliveStreamCleaner may crash with java.lang.IllegalMonit…

…orStateException: current thread is not owner

Reviewed-by: alanb, chegar, dfuchs

src/java.base/share/classes/sun/net/www/http/KeepAliveStreamCleaner.java

@@ -30,6 +30,7 @@
 import sun.net.NetProperties;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.ReentrantLock;
 
@@ -115,7 +116,7 @@ public void run()
                     long before = System.currentTimeMillis();
                     long timeout = TIMEOUT;
                     while ((kace = poll()) == null) {
-                        waiter.wait(timeout);
+                        waiter.await(timeout, TimeUnit.MILLISECONDS);
 
                         long after = System.currentTimeMillis();
                         long elapsed = after - before;

test/jdk/sun/net/www/http/KeepAliveCache/B5045306.java

@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 5045306 6356004 6993490
+ * @bug 5045306 6356004 6993490 8255124
  * @modules java.base/sun.net.www
  *          java.management
  * @library ../../httptest/
@@ -35,6 +35,8 @@
 import java.net.*;
 import java.io.*;
 import java.lang.management.*;
+import java.util.ArrayList;
+import java.util.List;
 
 /* Part 1:
  * The http client makes a connection to a URL whos content contains a lot of
@@ -69,6 +71,10 @@ public static void startHttpServer() {
     }
 
     public static void clientHttpCalls() {
+        List<Throwable> uncaught = new ArrayList<>();
+        Thread.setDefaultUncaughtExceptionHandler((t, ex) -> {
+            uncaught.add(ex);
+        });
         try {
             System.out.println("http server listen on: " + server.getLocalPort());
             String hostAddr =  InetAddress.getLocalHost().getHostAddress();
@@ -133,6 +139,9 @@ public static void clientHttpCalls() {
         } finally {
             server.terminate();
         }
+        if (!uncaught.isEmpty()) {
+            throw new RuntimeException("Unhandled exception:", uncaught.get(0));
+        }
     }
 }