--- old/modules/javafx.web/src/main/java/com/sun/webkit/network/CookieStore.java 2018-05-19 16:28:21.571583200 +0300 +++ new/modules/javafx.web/src/main/java/com/sun/webkit/network/CookieStore.java 2018-05-19 16:28:21.186200900 +0300 @@ -25,6 +25,9 @@ package com.sun.webkit.network; +import com.sun.javafx.logging.PlatformLogger; +import com.sun.javafx.logging.PlatformLogger.Level; + import java.util.LinkedHashMap; import java.util.Comparator; import java.util.Collections; @@ -35,16 +38,14 @@ import java.util.Map; import java.util.PriorityQueue; import java.util.Queue; -import java.util.logging.Level; -import java.util.logging.Logger; /** * A cookie store. */ final class CookieStore { - private static final Logger logger = - Logger.getLogger(CookieStore.class.getName()); + private static final PlatformLogger logger = + PlatformLogger.getLogger(CookieStore.class.getName()); private static final int MAX_BUCKET_SIZE = 50; private static final int TOTAL_COUNT_LOWER_THRESHOLD = 3000; @@ -104,7 +105,7 @@ boolean httpApi) { if (logger.isLoggable(Level.FINEST)) { - logger.log(Level.FINEST, "hostname: [{0}], path: [{1}], " + logger.finest("hostname: [{0}], path: [{1}], " + "secureProtocol: [{2}], httpApi: [{3}]", new Object[] { hostname, path, secureProtocol, httpApi}); } @@ -132,7 +133,7 @@ cookie.setLastAccessTime(currentTime); } - logger.log(Level.FINEST, "result: {0}", result); + logger.finest("result: {0}", result); return result; } @@ -226,7 +227,7 @@ * Removes excess cookies from a given bucket. */ private void purge(Map bucket) { - logger.log(Level.FINEST, "Purging bucket: {0}", bucket.values()); + logger.finest("Purging bucket: {0}", bucket.values()); Cookie earliestCookie = null; Iterator it = bucket.values().iterator(); @@ -255,7 +256,7 @@ * Removes excess cookies globally. */ private void purge() { - logger.log(Level.FINEST, "Purging store"); + logger.finest("Purging store"); Queue removalQueue = new PriorityQueue(totalCount / 2, new RemovalComparator()); @@ -300,8 +301,7 @@ Map bucket) { if (logger.isLoggable(Level.FINEST)) { - logger.log(Level.FINEST, "{0}: {1}, bucket size: {2}, " - + "total count: {3}", + logger.finest("{0}: {1}, bucket size: {2}, total count: {3}", new Object[] {message, cookie, bucket.size(), totalCount}); } }