billbarker 2004/12/15 19:51:42
Modified: util/java/org/apache/tomcat/util IntrospectionUtils.java
Log:
Ignore '$' chars that aren't part of a '${' replacement pattern.
Unlike with ant (which of course is what this is based off of), with this
patch you no longer have "$$" -> "$".
Based on patch by: Richard Clark [EMAIL PROTECTED]
Fix for Bug #32719
Revision Changes Path
1.14 +2 -2
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/IntrospectionUtils.java
Index: IntrospectionUtils.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/IntrospectionUtils.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- IntrospectionUtils.java 4 Oct 2004 09:25:55 -0000 1.13
+++ IntrospectionUtils.java 16 Dec 2004 03:51:41 -0000 1.14
@@ -473,8 +473,8 @@
sb.append('$');
prev = pos + 1;
} else if (value.charAt(pos + 1) != '{') {
- sb.append(value.charAt(pos + 1));
- prev = pos + 2; // XXX
+ sb.append('$');
+ prev = pos + 1; // XXX
} else {
int endName = value.indexOf('}', pos);
if (endName < 0) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
