--- old/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/HttpHeadersImpl.java	2017-11-30 04:04:15.676511990 -0800
+++ new/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/HttpHeadersImpl.java	2017-11-30 04:04:15.418489434 -0800
@@ -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
@@ -30,15 +30,13 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
-import java.util.OptionalLong;
 import java.util.Set;
 import java.util.TreeMap;
 
 /**
  * Implementation of HttpHeaders.
  */
-public class HttpHeadersImpl implements HttpHeaders {
+public class HttpHeadersImpl extends HttpHeaders {
 
     private final TreeMap<String,List<String>> headers;
 
@@ -47,35 +45,19 @@
     }
 
     @Override
-    public Optional<String> firstValue(String name) {
-        List<String> l = headers.get(name);
-        return Optional.ofNullable(l == null ? null : l.get(0));
-    }
-
-    @Override
-    public List<String> allValues(String name) {
-        return headers.get(name);
-    }
-
-    @Override
     public Map<String, List<String>> map() {
         return Collections.unmodifiableMap(headers);
     }
 
-    public Map<String, List<String>> directMap() {
-        return headers;
-    }
-
     // package private mutators
 
     public HttpHeadersImpl deepCopy() {
         HttpHeadersImpl h1 = new HttpHeadersImpl();
-        TreeMap<String,List<String>> headers1 = h1.headers;
         Set<String> keys = headers.keySet();
         for (String key : keys) {
             List<String> vals = headers.get(key);
             List<String> vals1 = new ArrayList<>(vals);
-            headers1.put(key, vals1);
+            h1.headers.put(key, vals1);
         }
         return h1;
     }
@@ -90,19 +72,4 @@
         values.add(value);
         headers.put(name, values);
     }
-
-    @Override
-    public OptionalLong firstValueAsLong(String name) {
-        List<String> l = headers.get(name);
-        if (l == null) {
-            return OptionalLong.empty();
-        } else {
-            String v = l.get(0);
-            return OptionalLong.of(Long.parseLong(v));
-        }
-    }
-
-    public void clear() {
-        headers.clear();
-    }
 }