isCloseRequired -> Closed

Align behaviour of methods with closed state

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1661514 13f79535-47bb-0310-9956-ffa450edef68

java/org/apache/coyote/http11/upgrade/LocalStrings.properties

@@ -25,11 +25,13 @@ upgrade.sis.isReady.ise=It is illegal to call isReady() when the ServletInputStr
 upgrade.sis.onErrorFail=onError processing for the registered ReadListener triggered this further error which was swallowed
 upgrade.sis.readListener.null=It is illegal to pass null to setReadListener()
 upgrade.sis.readListener.set=It is illegal to call setReadListener() more than once for the same upgraded connection
+upgrade.sis.read.closed=The InputStream has been closed
 upgrade.sis.read.ise=It is illegal to call any of the read() methods in non-blocking mode without first checking that there is data available by calling isReady()
 upgrade.sos.errorCloseFail=Failed to close OutputStream cleanly after a previous error
 upgrade.sos.canWrite.ise=It is illegal to call canWrite() when the ServletOutputStream is not in non-blocking mode (i.e. setWriteListener() must be called first)
 upgrade.sos.onErrorFail=onError processing for the registered WriteListener triggered this further error which was swallowed
 upgrade.sos.writeListener.null=It is illegal to pass null to setWriteListener()
 upgrade.sos.writeListener.set=It is illegal to call setWriteListener() more than once for the same upgraded connection
+upgrade.sos.write.closed=The OutputStream has been closed
 upgrade.sos.write.ise=It is illegal to call any of the write() methods in non-blocking mode without first checking that there is space available by calling isReady()
 

java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java

@@ -123,12 +123,12 @@ public final SocketState upgradeDispatch(SocketStatus status) {
             }
             return SocketState.CLOSED;
         }
-        if (upgradeServletInputStream.isCloseRequired() ||
-                upgradeServletOutputStream.isCloseRequired()) {
+        if (upgradeServletInputStream.isClosed() ||
+                upgradeServletOutputStream.isClosed()) {
             if (log.isDebugEnabled()) {
                 log.debug(sm.getString("upgradeProcessor.requiredClose",
-                        Boolean.valueOf(upgradeServletInputStream.isCloseRequired()),
-                        Boolean.valueOf(upgradeServletOutputStream.isCloseRequired())));
+                        Boolean.valueOf(upgradeServletInputStream.isClosed()),
+                        Boolean.valueOf(upgradeServletOutputStream.isClosed())));
             }
             return SocketState.CLOSED;
         }

java/org/apache/coyote/http11/upgrade/UpgradeServletInputStream.java

@@ -35,7 +35,7 @@ public class UpgradeServletInputStream extends ServletInputStream {
 
     private final SocketWrapperBase<?> socketWrapper;
 
-    private volatile boolean closeRequired = false;
+    private volatile boolean closed = false;
     // Start in blocking-mode
     private volatile Boolean ready = Boolean.TRUE;
     private volatile ReadListener listener = null;
@@ -66,6 +66,10 @@ public final boolean isReady() {
                     sm.getString("upgrade.sis.isReady.ise"));
         }
 
+        if (closed) {
+            return false;
+        }
+
         // If we already know the current state, return it.
         if (ready != null) {
             return ready.booleanValue();
@@ -90,6 +94,10 @@ public final void setReadListener(ReadListener listener) {
             throw new IllegalArgumentException(
                     sm.getString("upgrade.sis.readListener.set"));
         }
+        if (closed) {
+            throw new IllegalStateException(sm.getString("upgrade.sis.read.closed"));
+        }
+
         this.listener = listener;
         this.applicationLoader = Thread.currentThread().getContextClassLoader();
         // Switching to non-blocking. Don't know if data is available.
@@ -132,7 +140,7 @@ public final int read(byte[] b, int off, int len) throws IOException {
         try {
             return socketWrapper.read(listener == null, b, off, len);
         } catch (IOException ioe) {
-            closeRequired = true;
+            close();
             throw ioe;
         }
     }
@@ -141,14 +149,16 @@ public final int read(byte[] b, int off, int len) throws IOException {
 
     @Override
     public void close() throws IOException {
-        closeRequired = true;
+        closed = true;
     }
 
 
     private void preReadChecks() {
         if (listener != null && (ready == null || !ready.booleanValue())) {
-            throw new IllegalStateException(
-                    sm.getString("upgrade.sis.read.ise"));
+            throw new IllegalStateException(sm.getString("upgrade.sis.read.ise"));
+        }
+        if (closed) {
+            throw new IllegalStateException(sm.getString("upgrade.sis.read.closed"));
         }
         // No longer know if data is available
         ready = null;
@@ -163,7 +173,7 @@ private int readInternal() throws IOException {
         try {
             result = socketWrapper.read(listener == null, b, 0, 1);
         } catch (IOException ioe) {
-            closeRequired = true;
+            close();
             throw ioe;
         }
         if (result == 0) {
@@ -224,7 +234,7 @@ private final void onError(Throwable t) {
     }
 
 
-    final boolean isCloseRequired() {
-        return closeRequired;
+    final boolean isClosed() {
+        return closed;
     }
 }

java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.java

@@ -50,7 +50,7 @@ public class UpgradeServletOutputStream extends ServletOutputStream {
 
     private volatile boolean flushing = false;
 
-    private volatile boolean closeRequired = false;
+    private volatile boolean closed = false;
 
     // Start in blocking-mode
     private volatile WriteListener listener = null;
@@ -72,6 +72,9 @@ public final boolean isReady() {
             throw new IllegalStateException(
                     sm.getString("upgrade.sos.canWrite.is"));
         }
+        if (closed) {
+            return false;
+        }
 
         // Make sure isReady() and onWritePossible() have a consistent view of
         // fireListener when determining if the listener should fire
@@ -104,6 +107,9 @@ public final void setWriteListener(WriteListener listener) {
             throw new IllegalArgumentException(
                     sm.getString("upgrade.sos.writeListener.set"));
         }
+        if (closed) {
+            throw new IllegalStateException(sm.getString("upgrade.sos.write.closed"));
+        }
         // Container is responsible for first call to onWritePossible() but only
         // need to do this if setting the listener for the first time.
         synchronized (registeredLock) {
@@ -120,8 +126,8 @@ public final void setWriteListener(WriteListener listener) {
     }
 
 
-    final boolean isCloseRequired() {
-        return closeRequired;
+    final boolean isClosed() {
+        return closed;
     }
 
 
@@ -145,6 +151,7 @@ public void write(byte[] b, int off, int len) throws IOException {
 
     @Override
     public void flush() throws IOException {
+        preWriteChecks();
         flushInternal(listener == null, true);
     }
 
@@ -174,14 +181,21 @@ private void flushInternal(boolean block, boolean updateFlushing) throws IOExcep
 
     @Override
     public void close() throws IOException {
-        closeRequired = true;
+        if (closed) {
+            return;
+        }
+        closed = true;
+        flushInternal(true, true);
     }
 
 
     private void preWriteChecks() {
         if (listener != null && !socketWrapper.canWrite()) {
             throw new IllegalStateException(sm.getString("upgrade.sos.write.ise"));
         }
+        if (closed) {
+            throw new IllegalStateException(sm.getString("upgrade.sos.write.closed"));
+        }
     }