Author: markt
Date: Sat Aug 15 18:37:34 2009
New Revision: 804512
URL: http://svn.apache.org/viewvc?rev=804512&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=41824
Need to use canonical rather than binary form when writing code
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/compiler/JspUtil.java
Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=804512&r1=804511&r2=804512&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Sat Aug 15 18:37:34 2009
@@ -78,12 +78,6 @@
http://svn.apache.org/viewvc?rev=797600&view=rev
markt: +1 to the additional change if still required
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=41824
- Need to use canonical rather than binary form when writing code
- http://svn.apache.org/viewvc?rev=797607&view=rev
- +1: markt, rjung, kkolinko
- -1:
-
* Improve build.properties comment in ant build files.
Backport from trunk, only the part on build.xml.
http://svn.apache.org/viewvc?rev=797425&view=rev
Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=804512&r1=804511&r2=804512&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Sat Aug 15
18:37:34 2009
@@ -74,6 +74,10 @@
<bug>41661</bug>: Fix thread safety issue in JspConfig.init() (markt)
</fix>
<fix>
+ <bug>41824</bug>: Need to use canonical rather than binary form when
+ writing code. (markt)
+ </fix>
+ <fix>
<bug>46907</bug>: Don't swallow input stream when debug logging is
enabled. (markt)
</fix>
Modified:
tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/compiler/JspUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/compiler/JspUtil.java?rev=804512&r1=804511&r2=804512&view=diff
==============================================================================
---
tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/compiler/JspUtil.java
(original)
+++
tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/compiler/JspUtil.java
Sat Aug 15 18:37:34 2009
@@ -502,7 +502,7 @@
* or, if it's a primitive, the name of its correspondent boxed
* type.
*/
- String targetType = expectedType.getName();
+ String targetType = getCanonicalName(expectedType);
String primitiveConverterMethod = null;
if (expectedType.isPrimitive()) {
if (expectedType.equals(Boolean.TYPE)) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
