Author: markt
Date: Thu Jan 9 15:29:45 2014
New Revision: 1556836
URL: http://svn.apache.org/r1556836
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55974
Preserve the order of reported errors and warnings
Modified:
tomcat/trunk/java/org/apache/tomcat/util/descriptor/XmlErrorHandler.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/descriptor/XmlErrorHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/XmlErrorHandler.java?rev=1556836&r1=1556835&r2=1556836&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/descriptor/XmlErrorHandler.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/XmlErrorHandler.java
Thu Jan 9 15:29:45 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<>();
+ private final List<SAXParseException> errors = new ArrayList<>();
- private final Set<SAXParseException> warnings = new HashSet<>();
+ private final List<SAXParseException> warnings = new ArrayList<>();
@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;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
