--- old/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/DefaultPublisher.java	2017-11-30 04:06:28.434115703 -0800
+++ /dev/null	2017-10-28 22:49:55.551349757 -0700
@@ -1,143 +0,0 @@
-/*
- * Copyright (c) 2016, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.incubator.http;
-
-import java.util.Objects;
-import java.util.Optional;
-import java.util.concurrent.Executor;
-import java.util.concurrent.Flow;
-import java.util.concurrent.RejectedExecutionException;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.concurrent.locks.Condition;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
-import java.util.function.Supplier;
-
-class DefaultPublisher<T> implements Flow.Publisher<T> {
-
-    private final Supplier<Optional<T>> supplier;
-    // this executor will be wrapped in another executor
-    // which may override it and just run in the calling thread
-    // if it knows the user call is blocking
-    private final Executor executor;
-
-    /**
-     * Supplier returns non empty Optionals until final
-     */
-    DefaultPublisher(Supplier<Optional<T>> supplier, Executor executor) {
-        this.supplier = supplier;
-        this.executor = executor;
-    }
-
-    @Override
-    public void subscribe(Flow.Subscriber<? super T> subscriber) {
-        try {
-            subscriber.onSubscribe(new Subscription(subscriber));
-        } catch (RejectedExecutionException e) {
-            subscriber.onError(new IllegalStateException(e));
-        }
-    }
-
-    private class Subscription implements Flow.Subscription {
-
-        private final Flow.Subscriber<? super T> subscriber;
-        private final AtomicBoolean done = new AtomicBoolean();
-
-        private final AtomicLong demand = new AtomicLong();
-
-        private final Lock consumerLock = new ReentrantLock();
-        private final Condition consumerAlarm = consumerLock.newCondition();
-
-        Subscription(Flow.Subscriber<? super T> subscriber) {
-            this.subscriber = subscriber;
-
-            executor.execute(() -> {
-                try {
-                    while (!done.get()) {
-                        consumerLock.lock();
-                        try {
-                            while (!done.get() && demand.get() == 0) {
-                                consumerAlarm.await();
-                            }
-                        } finally {
-                            consumerLock.unlock();
-                        }
-
-                        long nbItemsDemanded = demand.getAndSet(0);
-                        for (long i = 0; i < nbItemsDemanded && !done.get(); i++) {
-                            try {
-                                Optional<T> item = Objects.requireNonNull(supplier.get());
-                                if (item.isPresent()) {
-                                    subscriber.onNext(item.get());
-                                } else {
-                                    if (done.compareAndSet(false, true)) {
-                                        subscriber.onComplete();
-                                    }
-                                }
-                            } catch (RuntimeException e) {
-                                if (done.compareAndSet(false, true)) {
-                                    subscriber.onError(e);
-                                }
-                            }
-                        }
-                    }
-                } catch (InterruptedException e) {
-                    Thread.currentThread().interrupt();
-                    if (done.compareAndSet(false, true)) {
-                        subscriber.onError(e);
-                    }
-                }
-            });
-        }
-
-        @Override
-        public void request(long n) {
-            if (!done.get() && n > 0) {
-                demand.updateAndGet(d -> (d + n > 0) ? d + n : Long.MAX_VALUE);
-                wakeConsumer();
-            } else if (done.compareAndSet(false, true)) {
-                subscriber.onError(new IllegalArgumentException("request(" + n + ")"));
-            }
-        }
-
-        @Override
-        public void cancel() {
-            done.set(true);
-            wakeConsumer();
-        }
-
-        private void wakeConsumer() {
-            consumerLock.lock();
-            try {
-                consumerAlarm.signal();
-            } finally {
-                consumerLock.unlock();
-            }
-        }
-
-    }
-}