You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ibatis.apache.org by jg...@apache.org on 2007/03/19 23:32:04 UTC
svn commit: r520131 - in
/ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/config/xml:
AbatorConfigurationParser.java ParserEntityResolver.java
Author: jgbutler
Date: Mon Mar 19 15:32:03 2007
New Revision: 520131
URL: http://svn.apache.org/viewvc?view=rev&rev=520131
Log:
Abator: Changes in parser to try and deal with external entities
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/config/xml/AbatorConfigurationParser.java
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/config/xml/ParserEntityResolver.java
Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/config/xml/AbatorConfigurationParser.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/config/xml/AbatorConfigurationParser.java?view=diff&rev=520131&r1=520130&r2=520131
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/config/xml/AbatorConfigurationParser.java (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/config/xml/AbatorConfigurationParser.java Mon Mar 19 15:32:03 2007
@@ -142,23 +142,27 @@
throw new XMLParserException(parseErrors);
}
- NodeList nodeList = document.getChildNodes();
- AbatorConfiguration gc = null;
- for (int i = 0; i < nodeList.getLength(); i++) {
- Node node = nodeList.item(i);
-
- if (node.getNodeType() == 1
- && "abatorConfiguration".equals(node.getNodeName())) { //$NON-NLS-1$
- gc = parseAbatorConfiguration(node);
+ AbatorConfiguration ac = null;
+ Node rootNode = document.getFirstChild();
+ while (rootNode != null) {
+ if (rootNode.getNodeType() == 1
+ && "abatorConfiguration".equals(rootNode.getNodeName())) { //$NON-NLS-1$
+ ac = parseAbatorConfiguration(rootNode);
break;
+ } else {
+ rootNode = rootNode.getNextSibling();
}
}
-
+
+ if (ac == null) {
+ throw new XMLParserException(Messages.getString("RuntimeError.5")); //$NON-NLS-1$
+ }
+
if (parseErrors.size() > 0) {
throw new XMLParserException(parseErrors);
}
- return gc;
+ return ac;
} catch (ParserConfigurationException e) {
parseErrors.add(e.getMessage());
throw new XMLParserException(parseErrors);
Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/config/xml/ParserEntityResolver.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/config/xml/ParserEntityResolver.java?view=diff&rev=520131&r1=520130&r2=520131
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/config/xml/ParserEntityResolver.java (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/config/xml/ParserEntityResolver.java Mon Mar 19 15:32:03 2007
@@ -19,7 +19,6 @@
import java.io.InputStream;
import org.apache.ibatis.abator.internal.sqlmap.XmlConstants;
-import org.apache.ibatis.abator.internal.util.messages.Messages;
import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -53,7 +52,7 @@
return ins;
} else {
- throw new SAXException(Messages.getString("RuntimeError.5")); //$NON-NLS-1$
+ return null;
}
}
}