Author: markt
Date: Tue Mar 5 12:05:38 2013
New Revision: 1452756
URL: http://svn.apache.org/r1452756
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54602
Ensure URI converter is recycled in case of error in previous conversion
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1449225,1452752
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=1452756&r1=1452755&r2=1452756&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
Tue Mar 5 12:05:38 2013
@@ -982,6 +982,8 @@ public class CoyoteAdapter implements Ad
if (conv == null) {
conv = new B2CConverter(enc);
request.setURIConverter(conv);
+ } else {
+ conv.recycle();
}
} catch (IOException e) {
// Ignore
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java?rev=1452756&r1=1452755&r2=1452756&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java Tue
Mar 5 12:05:38 2013
@@ -737,7 +737,7 @@ public class Request
}
/**
- * URI byte to char converter (not recycled).
+ * URI byte to char converter.
*/
protected B2CConverter URIConverter = null;
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1452756&r1=1452755&r2=1452756&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Mar 5 12:05:38 2013
@@ -91,6 +91,11 @@
this improved decoder for WebSocket connections. Remove the WebSocket
specific UTF-8 decoder. (markt)
</fix>
+ <fix>
+ <bug>54602</bug>: Recycle the byte to character converter used for URIs
+ between requests to ensure an error in one request does not trigger a
+ failure in the next request. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Web applications">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
