[jbossweb-commits] JBossWeb SVN: r2282 - branches/7.4.x/src/main/java/org/apache/catalina/connector.

[jbossweb-commits at lists.jboss.org]

Author: remy.maucherat at jboss.com
Date: 2013-10-16 08:46:56 -0400 (Wed, 16 Oct 2013)
New Revision: 2282

Modified:
   branches/7.4.x/src/main/java/org/apache/catalina/connector/CoyoteAdapter.java
   branches/7.4.x/src/main/java/org/apache/catalina/connector/Request.java
   branches/7.4.x/src/main/java/org/apache/catalina/connector/Response.java
Log:
- If upgrading, discard the IS and OS, the examples are not doing cleanup well enough.

Modified: branches/7.4.x/src/main/java/org/apache/catalina/connector/CoyoteAdapter.java
===================================================================
--- branches/7.4.x/src/main/java/org/apache/catalina/connector/CoyoteAdapter.java	2013-10-16 12:44:02 UTC (rev 2281)
+++ branches/7.4.x/src/main/java/org/apache/catalina/connector/CoyoteAdapter.java	2013-10-16 12:46:56 UTC (rev 2282)
@@ -267,6 +267,10 @@
                 req.getRequestProcessor().setWorkerThreadName(null);
                 // Recycle the wrapper request and response
                 if (error || close || response.isClosed()) {
+                    if (request.getUpgradeHandler() != null) {
+                        request.clearInputStream();
+                        response.clearOutputStream();
+                    }
                     request.recycle();
                     response.recycle();
                     res.action(ActionCode.ACTION_EVENT_END, null);

Modified: branches/7.4.x/src/main/java/org/apache/catalina/connector/Request.java
===================================================================
--- branches/7.4.x/src/main/java/org/apache/catalina/connector/Request.java	2013-10-16 12:44:02 UTC (rev 2281)
+++ branches/7.4.x/src/main/java/org/apache/catalina/connector/Request.java	2013-10-16 12:46:56 UTC (rev 2282)
@@ -597,6 +597,17 @@
 
 
     /**
+     * Clear output stream.
+     */
+    public void clearInputStream() {
+        if (inputStream != null) {
+            inputStream.clear();
+            inputStream = null;
+        }
+    }
+    
+
+    /**
      * Clear cached encoders (to save memory for event or async requests).
      */
     public void clearEncoders() {

Modified: branches/7.4.x/src/main/java/org/apache/catalina/connector/Response.java
===================================================================
--- branches/7.4.x/src/main/java/org/apache/catalina/connector/Response.java	2013-10-16 12:44:02 UTC (rev 2281)
+++ branches/7.4.x/src/main/java/org/apache/catalina/connector/Response.java	2013-10-16 12:46:56 UTC (rev 2282)
@@ -290,6 +290,17 @@
     }
     
 
+    /**
+     * Clear output stream.
+     */
+    public void clearOutputStream() {
+        if (outputStream != null) {
+            outputStream.clear();
+            outputStream = null;
+        }
+    }
+    
+
     // ------------------------------------------------------- Response Methods