You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by he...@apache.org on 2004/09/19 22:07:19 UTC
cvs commit: jakarta-turbine-2/xdocs changes.xml
henning 2004/09/19 13:07:19
Modified: . Tag: TURBINE_2_3_BRANCH project.xml
src/java/org/apache/turbine/services/intake/transform Tag:
TURBINE_2_3_BRANCH XmlToAppData.java
xdocs Tag: TURBINE_2_3_BRANCH changes.xml
Log:
Intake Fix for multiple calls to characters(). This is the obvious fix.
Reported by M. Sean Gilligan <se...@catalla.com>
PR: TTWS63
Revision Changes Path
No revision
No revision
1.136.2.13 +4 -0 jakarta-turbine-2/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/project.xml,v
retrieving revision 1.136.2.12
retrieving revision 1.136.2.13
diff -u -r1.136.2.12 -r1.136.2.13
--- project.xml 24 Aug 2004 21:11:51 -0000 1.136.2.12
+++ project.xml 19 Sep 2004 20:07:18 -0000 1.136.2.13
@@ -227,6 +227,10 @@
<email>celkins@scardini.com</email>
</contributor>
<contributor>
+ <name>M. Sean Gilligan</name>
+ <email>Sean_Gilligan@catalla.com</email>
+ </contributor>
+ <contributor>
<name>Jian He</name>
<email>hjnet@163.net</email>
</contributor>
No revision
No revision
1.7.2.3 +29 -13 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/transform/XmlToAppData.java
Index: XmlToAppData.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/transform/XmlToAppData.java,v
retrieving revision 1.7.2.2
retrieving revision 1.7.2.3
diff -u -r1.7.2.2 -r1.7.2.3
--- XmlToAppData.java 20 May 2004 03:06:49 -0000 1.7.2.2
+++ XmlToAppData.java 19 Sep 2004 20:07:18 -0000 1.7.2.3
@@ -57,7 +57,8 @@
private XmlGroup currGroup;
private XmlField currField;
private Rule currRule;
- private String currElement;
+
+ private StringBuffer charBuffer = null;
private static SAXParserFactory saxFactory;
@@ -121,7 +122,8 @@
public void startElement(String uri, String localName,
String rawName, Attributes attributes)
{
- currElement = rawName;
+ charBuffer = new StringBuffer();
+
if (rawName.equals("input-data"))
{
app.loadFromXML(attributes);
@@ -146,17 +148,31 @@
*/
public void characters(char[] mesgArray, int start, int length)
{
- String cdata = new String(mesgArray, start, length).trim();
- if ("rule".equals(currElement) && cdata.length() > 0)
- {
- currRule.setMessage(cdata);
- }
- if ("required-message".equals(currElement) && cdata.length() > 0)
+ charBuffer.append(mesgArray, start, length);
+ }
+
+ /**
+ * Handles closing Elements of the XML file
+ */
+
+ public void endElement(String uri, String localName,
+ String rawName)
+ {
+ if (charBuffer.length() > 0)
{
- log.warn("The required-message element is deprecated! " +
- "You should update your intake.xml file to use the " +
- "'required' rule instead.");
- currField.setIfRequiredMessage(cdata);
+ String cdata = charBuffer.toString().trim();
+
+ if ("rule".equals(rawName))
+ {
+ currRule.setMessage(cdata);
+ }
+ else if ("required-message".equals(rawName))
+ {
+ log.warn("The required-message element is deprecated! " +
+ "You should update your intake.xml file to use the " +
+ "'required' rule instead.");
+ currField.setIfRequiredMessage(cdata);
+ }
}
}
No revision
No revision
1.60.2.21 +3 -0 jakarta-turbine-2/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/xdocs/changes.xml,v
retrieving revision 1.60.2.20
retrieving revision 1.60.2.21
diff -u -r1.60.2.20 -r1.60.2.21
--- changes.xml 24 Aug 2004 21:11:52 -0000 1.60.2.20
+++ changes.xml 19 Sep 2004 20:07:19 -0000 1.60.2.21
@@ -106,6 +106,9 @@
Turbine that threw a class cast exception in Commons
Collections and crashed Velocity. Isn't Java a cool thing?
</li>
+ <li>
+ TTWS63: Intake rule parser sometimes corrupted rule message text.
+ </li>
</ul>
</p>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org