src/java.net.http/share/classes/jdk/internal/net/http/RequestPublishers.java
branchhttp-client-branch
changeset 56138 4f92b988600e
parent 56092 fd85b2bf2b0d
child 56257 82a9340bdda6
--- a/src/java.net.http/share/classes/jdk/internal/net/http/RequestPublishers.java	Fri Feb 16 10:34:17 2018 +0000
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/RequestPublishers.java	Fri Feb 16 15:06:29 2018 +0000
@@ -219,27 +219,18 @@
 
     public static class FilePublisher implements BodyPublisher  {
         private final File file;
-        private volatile AccessControlContext acc;
 
         public FilePublisher(Path name) {
             file = name.toFile();
         }
 
-        void setAccessControlContext(AccessControlContext acc) {
-            this.acc = acc;
-        }
-
         @Override
         public void subscribe(Flow.Subscriber<? super ByteBuffer> subscriber) {
-            if (System.getSecurityManager() != null && acc == null)
-                throw new InternalError(
-                        "Unexpected null acc when security manager has been installed");
-
             InputStream is;
             try {
                 PrivilegedExceptionAction<FileInputStream> pa =
                         () -> new FileInputStream(file);
-                is = AccessController.doPrivileged(pa, acc);
+                is = AccessController.doPrivileged(pa);
             } catch (PrivilegedActionException pae) {
                 throw new UncheckedIOException((IOException)pae.getCause());
             }
@@ -250,9 +241,8 @@
 
         @Override
         public long contentLength() {
-            assert System.getSecurityManager() != null ? acc != null: true;
             PrivilegedAction<Long> pa = () -> file.length();
-            return AccessController.doPrivileged(pa, acc);
+            return AccessController.doPrivileged(pa);
         }
     }