# HG changeset patch
# User chegar
# Date 1516209695 0
# Node ID ae3a51bc5b9f549693794862ea1a8cc942e6720c
# Parent  2cb33775fc6f1db6f6c47d7b6769eaf9bdf901eb
http-client-branch: fix acc in PushGroup

diff -r 2cb33775fc6f -r ae3a51bc5b9f src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PushGroup.java
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PushGroup.java	Wed Jan 17 12:19:06 2018 +0000
+++ b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PushGroup.java	Wed Jan 17 17:21:35 2018 +0000
@@ -26,9 +26,10 @@
 package jdk.incubator.http;
 
 import java.security.AccessControlContext;
+import java.security.AccessController;
 import java.util.Objects;
-import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
+import jdk.incubator.http.HttpResponse.BodyHandler;
 import jdk.incubator.http.HttpResponse.PushPromiseHandler;
 import jdk.incubator.http.HttpResponse.UntrustedBodyHandler;
 import jdk.incubator.http.internal.common.MinimalFuture;
@@ -74,44 +75,41 @@
         this.acc = acc;
     }
 
-    static class Acceptor<T> {
-        final HttpRequest initiator, push;
-        volatile HttpResponse.BodyHandler<T> bodyHandler = null;
-        volatile CompletableFuture<HttpResponse<T>> cf;
+    interface Acceptor<T> {
+        BodyHandler<T> bodyHandler();
+        CompletableFuture<HttpResponse<T>> cf();
+        boolean accepted();
+    }
 
-        Acceptor(HttpRequest initiator, HttpRequest push) {
-            this.initiator = initiator;
-            this.push = push;
-        }
+    private static class AcceptorImpl<T> implements Acceptor<T> {
+        private volatile HttpResponse.BodyHandler<T> bodyHandler;
+        private volatile CompletableFuture<HttpResponse<T>> cf;
 
-        CompletableFuture<HttpResponse<T>> accept(HttpResponse.BodyHandler<T> bodyHandler) {
+        CompletableFuture<HttpResponse<T>> accept(BodyHandler<T> bodyHandler) {
             Objects.requireNonNull(bodyHandler);
+            if (this.bodyHandler != null)
+                throw new IllegalStateException("non-null bodyHandler");
+            this.bodyHandler = bodyHandler;
             cf = new MinimalFuture<>();
-            if (this.bodyHandler != null)
-                throw new IllegalStateException();
-            this.bodyHandler = bodyHandler;
             return cf;
         }
 
-        HttpResponse.BodyHandler<T> bodyHandler() {
-            return bodyHandler;
-        }
+        @Override public BodyHandler<T> bodyHandler() { return bodyHandler; }
 
-        CompletableFuture<HttpResponse<T>> cf() {
-            return cf;
-        }
+        @Override public CompletableFuture<HttpResponse<T>> cf() { return cf; }
 
-        boolean accepted() {
-            return cf != null;
-        }
+        @Override public boolean accepted() { return cf != null; }
     }
 
     Acceptor<T> acceptPushRequest(HttpRequest pushRequest) {
-        Acceptor<T> acceptor = new Acceptor<>(initiatingRequest, pushRequest);
+        AcceptorImpl<T> acceptor = new AcceptorImpl<>();
 
         pushPromiseHandler.applyPushPromise(initiatingRequest, pushRequest, acceptor::accept);
 
         if (acceptor.accepted()) {
+            if (acceptor.bodyHandler instanceof UntrustedBodyHandler) {
+                ((UntrustedBodyHandler)acceptor.bodyHandler).setAccessControlContext(acc);
+            }
             numberOfPushes++;
             remainingPushes++;
         }
diff -r 2cb33775fc6f -r ae3a51bc5b9f src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Stream.java
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Stream.java	Wed Jan 17 12:19:06 2018 +0000
+++ b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Stream.java	Wed Jan 17 17:21:35 2018 +0000
@@ -436,7 +436,6 @@
         }
 
         PushGroup.Acceptor<T> acceptor = pushGroup.acceptPushRequest(pushRequest);
-        CompletableFuture<HttpResponse<T>> pushResponseCF = acceptor.cf();
 
         if (!acceptor.accepted()) {
             // cancel / reject
@@ -449,13 +448,15 @@
             return;
         }
 
-        CompletableFuture<HttpResponse<T>> cf = pushStream.responseCF();
+        CompletableFuture<HttpResponse<T>> pushResponseCF = acceptor.cf();
         HttpResponse.BodyHandler<T> pushHandler = acceptor.bodyHandler();
+        assert pushHandler != null;
 
         pushStream.requestSent();
         pushStream.setPushHandler(pushHandler);  // TODO: could wrap the handler to throw on acceptPushPromise ?
         // setup housekeeping for when the push is received
         // TODO: deal with ignoring of CF anti-pattern
+        CompletableFuture<HttpResponse<T>> cf = pushStream.responseCF();
         cf.whenComplete((HttpResponse<T> resp, Throwable t) -> {
             t = Utils.getCompletionCause(t);
             if (Log.trace()) {