cziegeler 02/02/14 01:27:20
Modified: src/scratchpad/org/apache/avalon/excalibur/xml
JaxpParser.java
Log:
Fixed parser implementation
Revision Changes Path
1.12 +25 -11
jakarta-avalon-excalibur/src/scratchpad/org/apache/avalon/excalibur/xml/JaxpParser.java
Index: JaxpParser.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/src/scratchpad/org/apache/avalon/excalibur/xml/JaxpParser.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- JaxpParser.java 14 Feb 2002 08:04:21 -0000 1.11
+++ JaxpParser.java 14 Feb 2002 09:27:20 -0000 1.12
@@ -62,7 +62,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Sylvain Wallez</a>
- * @version CVS $Revision: 1.11 $ $Date: 2002/02/14 08:04:21 $
+ * @version CVS $Revision: 1.12 $ $Date: 2002/02/14 09:27:20 $
*/
public class JaxpParser
extends AbstractLogEnabled
@@ -135,14 +135,21 @@
// Get the SAXFactory
final String saxParserFactoryName =
params.getParameter("sax-parser-factory",
"javax.xml.parsers.SAXParserFactory");
- try
+ if
("javax.xml.parsers.SAXParserFactory".equals(saxParserFactoryName) )
{
- final Class factoryClass = this.loadClass( saxParserFactoryName
);
- this.factory = (SAXParserFactory)factoryClass.newInstance();
+ this.factory = SAXParserFactory.newInstance();
}
- catch(Exception e)
+ else
{
- throw new ParameterException("Cannot load SAXParserFactory class
" + saxParserFactoryName, e);
+ try
+ {
+ final Class factoryClass = this.loadClass(
saxParserFactoryName );
+ this.factory = (SAXParserFactory)factoryClass.newInstance();
+ }
+ catch(Exception e)
+ {
+ throw new ParameterException("Cannot load SAXParserFactory
class " + saxParserFactoryName, e);
+ }
}
this.factory.setNamespaceAware(true);
this.factory.setValidating(validate);
@@ -150,14 +157,21 @@
// Get the DocumentFactory
final String documentBuilderFactoryName =
params.getParameter("document-builder-factory",
"javax.xml.parsers.DocumentBuilderFactory");
- try
+ if
("javax.xml.parsers.DocumentBuilderFactory".equals(documentBuilderFactoryName) )
{
- final Class factoryClass = this.loadClass(
documentBuilderFactoryName );
- this.docFactory =
(DocumentBuilderFactory)factoryClass.newInstance();
+ this.docFactory = DocumentBuilderFactory.newInstance();
}
- catch(Exception e)
+ else
{
- throw new ParameterException("Cannot load DocumentBuilderFactory
class " + documentBuilderFactoryName, e);
+ try
+ {
+ final Class factoryClass = this.loadClass(
documentBuilderFactoryName );
+ this.docFactory =
(DocumentBuilderFactory)factoryClass.newInstance();
+ }
+ catch(Exception e)
+ {
+ throw new ParameterException("Cannot load
DocumentBuilderFactory class " + documentBuilderFactoryName, e);
+ }
}
this.docFactory.setNamespaceAware(true);
this.docFactory.setValidating(validate);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
