Author: markt
Date: Thu May 29 10:28:23 2014
New Revision: 1598246
URL: http://svn.apache.org/r1598246
Log:
Remove Response methods where the only function is to call action() and call
action() directly.
Modified:
tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java
tomcat/trunk/java/org/apache/catalina/connector/Response.java
tomcat/trunk/java/org/apache/coyote/Response.java
tomcat/trunk/java/org/apache/coyote/spdy/SpdyProcessor.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java?rev=1598246&r1=1598245&r2=1598246&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java Thu May
29 10:28:23 2014
@@ -300,8 +300,7 @@ public class OutputBuffer extends Writer
CoyoteAdapter.ADAPTER_NOTES);
req.inputBuffer.close();
- coyoteResponse.finish();
-
+ coyoteResponse.action(ActionCode.CLOSE, null);
}
Modified: tomcat/trunk/java/org/apache/catalina/connector/Response.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Response.java?rev=1598246&r1=1598245&r2=1598246&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Response.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Response.java Thu May 29
10:28:23 2014
@@ -45,6 +45,7 @@ import org.apache.catalina.Wrapper;
import org.apache.catalina.security.SecurityUtil;
import org.apache.catalina.util.RequestUtil;
import org.apache.catalina.util.SessionConfig;
+import org.apache.coyote.ActionCode;
import org.apache.tomcat.util.buf.CharChunk;
import org.apache.tomcat.util.buf.UEncoder;
import org.apache.tomcat.util.http.FastHttpDateFormat;
@@ -1137,7 +1138,7 @@ public class Response
/**
- * Send an acknowledgment of a request.
+ * Send an acknowledgement of a request.
*
* @exception IOException if an input/output error occurs
*/
@@ -1153,8 +1154,7 @@ public class Response
return;
}
- coyoteResponse.acknowledge();
-
+ coyoteResponse.action(ActionCode.ACK, null);
}
Modified: tomcat/trunk/java/org/apache/coyote/Response.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/Response.java?rev=1598246&r1=1598245&r2=1598246&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/Response.java (original)
+++ tomcat/trunk/java/org/apache/coyote/Response.java Thu May 29 10:28:23 2014
@@ -292,16 +292,6 @@ public final class Response {
}
- public void finish() {
- action(ActionCode.CLOSE, this);
- }
-
-
- public void acknowledge() {
- action(ActionCode.ACK, this);
- }
-
-
// -------------------- Headers --------------------
/**
* Warning: This method always returns <code>false<code> for Content-Type
Modified: tomcat/trunk/java/org/apache/coyote/spdy/SpdyProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/spdy/SpdyProcessor.java?rev=1598246&r1=1598245&r2=1598246&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/spdy/SpdyProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/spdy/SpdyProcessor.java Thu May 29
10:28:23 2014
@@ -200,7 +200,7 @@ public class SpdyProcessor<S> extends Ab
finished = true;
- response.finish();
+ response.action(ActionCode.CLOSE, null);
}
private static final byte[] EMPTY = new byte[0];
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
