Author: markt
Date: Thu Jan 9 15:37:26 2014
New Revision: 1556840
URL: http://svn.apache.org/r1556840
Log:
Preserve the order of reported errors and warnings
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/descriptor/XmlErrorHandler.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1556836
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/descriptor/XmlErrorHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/descriptor/XmlErrorHandler.java?rev=1556840&r1=1556839&r2=1556840&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/descriptor/XmlErrorHandler.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/descriptor/XmlErrorHandler.java
Thu Jan 9 15:37:26 2014
@@ -16,8 +16,8 @@
*/
package org.apache.tomcat.util.descriptor;
-import java.util.HashSet;
-import java.util.Set;
+import java.util.ArrayList;
+import java.util.List;
import org.apache.juli.logging.Log;
import org.apache.tomcat.util.res.StringManager;
@@ -30,9 +30,9 @@ public class XmlErrorHandler implements
private static final StringManager sm =
StringManager.getManager(Constants.PACKAGE_NAME);
- private final Set<SAXParseException> errors = new
HashSet<SAXParseException>();
+ private final List<SAXParseException> errors = new
ArrayList<SAXParseException>();
- private final Set<SAXParseException> warnings = new
HashSet<SAXParseException>();
+ private final List<SAXParseException> warnings = new
ArrayList<SAXParseException>();
@Override
public void error(SAXParseException exception) throws SAXException {
@@ -52,12 +52,12 @@ public class XmlErrorHandler implements
warnings.add(exception);
}
- public Set<SAXParseException> getErrors() {
+ public List<SAXParseException> getErrors() {
// Internal use only - don't worry about immutability
return errors;
}
- public Set<SAXParseException> getWarnings() {
+ public List<SAXParseException> getWarnings() {
// Internal use only - don't worry about immutability
return warnings;
}
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=1556840&r1=1556839&r2=1556840&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Jan 9 15:37:26 2014
@@ -74,6 +74,10 @@
<bug>55960</bug>: Improve the single sign on (SSO) unit tests. Patch
provided by Brian Burch. (markt)
</fix>
+ <fix>
+ <bug>55974</bug>: Retain order when reporting errors and warnings while
+ parsing XML configuration files. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
