Author: markt
Date: Thu Nov 23 10:58:56 2006
New Revision: 478639
URL: http://svn.apache.org/viewvc?view=rev&rev=478639
Log:
Fix bug 41017. Restore original behaviour of setString(null). Port of Remy's
fix from TC6.
Modified:
tomcat/connectors/trunk/util/java/org/apache/tomcat/util/buf/MessageBytes.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
Modified:
tomcat/connectors/trunk/util/java/org/apache/tomcat/util/buf/MessageBytes.java
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/util/java/org/apache/tomcat/util/buf/MessageBytes.java?view=diff&rev=478639&r1=478638&r2=478639
==============================================================================
---
tomcat/connectors/trunk/util/java/org/apache/tomcat/util/buf/MessageBytes.java
(original)
+++
tomcat/connectors/trunk/util/java/org/apache/tomcat/util/buf/MessageBytes.java
Thu Nov 23 10:58:56 2006
@@ -183,15 +183,18 @@
* Set the content to be a string
*/
public void setString( String s ) {
- if (s == null)
- return;
strValue=s;
- hasStrValue=true;
hasHashCode=false;
hasIntValue=false;
hasLongValue=false;
hasDateValue=false;
- type=T_STR;
+ if (s == null) {
+ hasStrValue=false;
+ type=T_NULL;
+ } else {
+ hasStrValue=true;
+ type=T_STR;
+ }
}
// -------------------- Conversion and getters --------------------
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?view=diff&rev=478639&r1=478638&r2=478639
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Thu Nov 23 10:58:56 2006
@@ -136,6 +136,10 @@
SavedRequestInputFilter.doRead() so POST data may be read using a
Valve or Filter. Patch provided by Michael Dufel. (markt)
</fix>
+ <fix>
+ <bug>41017</bug>: Restore behaviour of MessageBytes.setString(null).
+ (remm/markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
