--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/CookieFilter.java	Tue Nov 14 14:58:39 2017 +0000
+++ b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/CookieFilter.java	Tue Nov 14 15:14:51 2017 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
 package jdk.incubator.http;
 
 import java.io.IOException;
-import java.net.CookieManager;
+import java.net.CookieHandler;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -41,11 +41,11 @@
     @Override
     public void request(HttpRequestImpl r, MultiExchange<?,?> e) throws IOException {
         HttpClientImpl client = e.client();
-        Optional<CookieManager> cookieManOpt = client.cookieManager();
-        if (cookieManOpt.isPresent()) {
-            CookieManager cookieMan = cookieManOpt.get();
+        Optional<CookieHandler> cookieHandlerOpt = client.cookieHandler();
+        if (cookieHandlerOpt.isPresent()) {
+            CookieHandler cookieHandler = cookieHandlerOpt.get();
             Map<String,List<String>> userheaders = r.getUserHeaders().map();
-            Map<String,List<String>> cookies = cookieMan.get(r.uri(), userheaders);
+            Map<String,List<String>> cookies = cookieHandler.get(r.uri(), userheaders);
 
             // add the returned cookies
             HttpHeadersImpl systemHeaders = r.getSystemHeaders();
@@ -74,9 +74,9 @@
         HttpRequestImpl request = r.request();
         Exchange<?> e = r.exchange;
         Log.logTrace("Response: processing cookies for {0}", request.uri());
-        Optional<CookieManager> cookieManOpt = e.client().cookieManager();
-        if (cookieManOpt.isPresent()) {
-            CookieManager cookieMan = cookieManOpt.get();
+        Optional<CookieHandler> cookieHandlerOpt = e.client().cookieHandler();
+        if (cookieHandlerOpt.isPresent()) {
+            CookieHandler cookieMan = cookieHandlerOpt.get();
             Log.logTrace("Response: parsing cookies from {0}", hdrs.map());
             cookieMan.put(request.uri(), hdrs.map());
         } else {