Author: remy.maucherat(a)jboss.com
Date: 2009-11-04 20:00:27 -0500 (Wed, 04 Nov 2009)
New Revision: 1241
Modified:
trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
trunk/java/org/apache/catalina/connector/Request.java
Log:
- Fix apparent null problems with the algorithm.
Modified: trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
===================================================================
--- trunk/java/org/apache/catalina/connector/CoyoteAdapter.java 2009-11-04 22:25:59 UTC
(rev 1240)
+++ trunk/java/org/apache/catalina/connector/CoyoteAdapter.java 2009-11-05 01:00:27 UTC
(rev 1241)
@@ -302,7 +302,6 @@
// Recycle the wrapper request and response
if (error || close || response.isClosed()) {
request.recycle();
- request.setFilterChain(null);
response.recycle();
res.action(ActionCode.ACTION_EVENT_END, null);
}
@@ -365,10 +364,6 @@
if (!response.isClosed() && !response.isError()) {
res.action(ActionCode.ACTION_EVENT_BEGIN, null);
event = true;
- } else {
- // Clear the filter chain, as otherwise it will not be reset
elsewhere
- // since this is an event driven request
- request.setFilterChain(null);
}
}
Modified: trunk/java/org/apache/catalina/connector/Request.java
===================================================================
--- trunk/java/org/apache/catalina/connector/Request.java 2009-11-04 22:25:59 UTC (rev
1240)
+++ trunk/java/org/apache/catalina/connector/Request.java 2009-11-05 01:00:27 UTC (rev
1241)
@@ -505,6 +505,7 @@
localAddr = null;
localName = null;
currentFilterChain = 0;
+ filterChains.clear();
attributes.clear();
notes.clear();
@@ -648,7 +649,7 @@
*/
public ApplicationFilterChain getFilterChain() {
if (currentFilterChain < filterChains.size()) {
- return filterChains.get(currentFilterChain++);
+ return filterChains.get(currentFilterChain);
} else {
return null;
}