Author: markt
Date: Fri Dec 21 20:49:59 2012
New Revision: 1425136
URL: http://svn.apache.org/viewvc?rev=1425136&view=rev
Log:
Need to be able to close the upgraded input/output streams
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletInputStream.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprServletInputStream.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprServletOutputStream.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/BioServletInputStream.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/BioServletOutputStream.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioServletInputStream.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioServletOutputStream.java
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletInputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletInputStream.java?rev=1425136&r1=1425135&r2=1425136&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletInputStream.java
(original)
+++
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletInputStream.java
Fri Dec 21 20:49:59 2012
@@ -120,6 +120,13 @@ public abstract class AbstractServletInp
}
+
+ @Override
+ public void close() throws IOException {
+ doClose();
+ }
+
+
private void preReadChecks() {
if (listener != null && (ready == null || !ready.booleanValue())) {
throw new IllegalStateException(
@@ -170,4 +177,6 @@ public abstract class AbstractServletInp
protected abstract int doRead(boolean block, byte[] b, int off, int len)
throws IOException;
+
+ protected abstract void doClose() throws IOException;
}
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java?rev=1425136&r1=1425135&r2=1425136&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
(original)
+++
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
Fri Dec 21 20:49:59 2012
@@ -68,6 +68,11 @@ public abstract class AbstractServletOut
}
+ @Override
+ public void close() throws IOException {
+ doClose();
+ }
+
private void preWriteChecks() {
if (buffer != null) {
throw new IllegalStateException(
@@ -110,4 +115,6 @@ public abstract class AbstractServletOut
throws IOException;
protected abstract void doFlush() throws IOException;
+
+ protected abstract void doClose() throws IOException;
}
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprServletInputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprServletInputStream.java?rev=1425136&r1=1425135&r2=1425136&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprServletInputStream.java
(original)
+++
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprServletInputStream.java
Fri Dec 21 20:49:59 2012
@@ -78,4 +78,8 @@ public class AprServletInputStream exten
return false;
}
+ @Override
+ protected void doClose() throws IOException {
+ // TODO Auto-generated method stub
+ }
}
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprServletOutputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprServletOutputStream.java?rev=1425136&r1=1425135&r2=1425136&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprServletOutputStream.java
(original)
+++
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprServletOutputStream.java
Fri Dec 21 20:49:59 2012
@@ -41,4 +41,10 @@ public class AprServletOutputStream exte
protected void doFlush() throws IOException {
// TODO Auto-generated method stub
}
+
+
+ @Override
+ protected void doClose() throws IOException {
+ // TODO Auto-generated method stub
+ }
}
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/BioServletInputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/BioServletInputStream.java?rev=1425136&r1=1425135&r2=1425136&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/coyote/http11/upgrade/BioServletInputStream.java
(original)
+++
tomcat/trunk/java/org/apache/coyote/http11/upgrade/BioServletInputStream.java
Fri Dec 21 20:49:59 2012
@@ -42,4 +42,9 @@ public class BioServletInputStream exten
// Always returns true for BIO
return true;
}
+
+ @Override
+ protected void doClose() throws IOException {
+ inputStream.close();
+ }
}
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/BioServletOutputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/BioServletOutputStream.java?rev=1425136&r1=1425135&r2=1425136&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/coyote/http11/upgrade/BioServletOutputStream.java
(original)
+++
tomcat/trunk/java/org/apache/coyote/http11/upgrade/BioServletOutputStream.java
Fri Dec 21 20:49:59 2012
@@ -42,4 +42,9 @@ public class BioServletOutputStream exte
protected void doFlush() throws IOException {
os.flush();
}
+
+ @Override
+ protected void doClose() throws IOException {
+ os.close();
+ }
}
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioServletInputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioServletInputStream.java?rev=1425136&r1=1425135&r2=1425136&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioServletInputStream.java
(original)
+++
tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioServletInputStream.java
Fri Dec 21 20:49:59 2012
@@ -101,6 +101,14 @@ public class NioServletInputStream exten
return len - leftToWrite;
}
+
+
+ @Override
+ protected void doClose() throws IOException {
+ channel.close();
+ }
+
+
private int fillReadBuffer(boolean block) throws IOException {
int nRead;
if (block) {
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioServletOutputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioServletOutputStream.java?rev=1425136&r1=1425135&r2=1425136&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioServletOutputStream.java
(original)
+++
tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioServletOutputStream.java
Fri Dec 21 20:49:59 2012
@@ -125,4 +125,10 @@ public class NioServletOutputStream exte
}
}
}
+
+
+ @Override
+ protected void doClose() throws IOException {
+ nioChannel.close();
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
