sboag 01/01/31 12:54:42
Modified: java/src/org/apache/xalan/processor ProcessorInclude.java
TransformerFactoryImpl.java
java/src/org/apache/xalan/transformer TrAXFilter.java
TransformerIdentityImpl.java TransformerImpl.java
java/src/org/apache/xpath SourceTreeManager.java
Log:
Added AbstractMethodError handling for when JAXP does not work, in addition
to NoSuchMethodError handling.
Revision Changes Path
1.16 +4 -1
xml-xalan/java/src/org/apache/xalan/processor/ProcessorInclude.java
Index: ProcessorInclude.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/processor/ProcessorInclude.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ProcessorInclude.java 2000/12/18 17:27:23 1.15
+++ ProcessorInclude.java 2001/01/31 20:54:35 1.16
@@ -277,8 +277,11 @@
throw new org.xml.sax.SAXException( ex );
} catch( javax.xml.parsers.FactoryConfigurationError ex1 ) {
throw new org.xml.sax.SAXException( ex1.toString() );
- } catch( NoSuchMethodError ex2 ) {
+ }
+ catch( NoSuchMethodError ex2 )
+ {
}
+ catch (AbstractMethodError ame){}
}
if (null == reader)
reader = XMLReaderFactory.createXMLReader();
1.23 +47 -45
xml-xalan/java/src/org/apache/xalan/processor/TransformerFactoryImpl.java
Index: TransformerFactoryImpl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/processor/TransformerFactoryImpl.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- TransformerFactoryImpl.java 2001/01/26 18:48:49 1.22
+++ TransformerFactoryImpl.java 2001/01/31 20:54:36 1.23
@@ -211,18 +211,18 @@
catch (org.xml.sax.SAXException se)
{
if( m_errorListener != null ) {
- try {
- m_errorListener.fatalError( new TransformerException( se ) );
- } catch( TransformerException ex ) {
- throw new TransformerConfigurationException( ex );
- }
- return null;
+ try {
+ m_errorListener.fatalError( new TransformerException( se ) );
+ } catch( TransformerException ex ) {
+ throw new TransformerConfigurationException( ex );
+ }
+ return null;
} else
- // Should remove this later... but right now diagnostics from
- // TransformerConfigurationException are not good.
- // se.printStackTrace();
- throw new TransformerConfigurationException("processFromNode failed",
- se);
+ // Should remove this later... but right now diagnostics from
+ // TransformerConfigurationException are not good.
+ // se.printStackTrace();
+ throw new TransformerConfigurationException("processFromNode failed",
+ se);
}
}
@@ -350,6 +350,7 @@
throw new org.xml.sax.SAXException(ex1.toString());
}
catch (NoSuchMethodError ex2){}
+ catch (AbstractMethodError ame){}
if (null == reader)
{
@@ -507,12 +508,12 @@
return new TrAXFilter(templates);
} catch( TransformerConfigurationException ex ) {
if( m_errorListener != null) {
- try {
- m_errorListener.fatalError( ex );
- return null;
- } catch( TransformerException ex1 ) {
- new TransformerConfigurationException(ex1);
- }
+ try {
+ m_errorListener.fatalError( ex );
+ return null;
+ } catch( TransformerException ex1 ) {
+ new TransformerConfigurationException(ex1);
+ }
}
throw ex;
}
@@ -553,19 +554,19 @@
{
try {
TransformerImpl transformer =
- (TransformerImpl) templates.newTransformer();
+ (TransformerImpl) templates.newTransformer();
TransformerHandler th =
- (TransformerHandler) transformer.getInputContentHandler(true);
+ (TransformerHandler) transformer.getInputContentHandler(true);
return th;
} catch( TransformerConfigurationException ex ) {
if( m_errorListener != null ) {
- try {
- m_errorListener.fatalError( ex );
- return null;
- } catch (TransformerException ex1 ) {
- ex=new TransformerConfigurationException(ex1);
- }
+ try {
+ m_errorListener.fatalError( ex );
+ return null;
+ } catch (TransformerException ex1 ) {
+ ex=new TransformerConfigurationException(ex1);
+ }
}
throw ex;
}
@@ -636,18 +637,18 @@
throw any exception in fatalError.
The spec says: "a Transformer must use this interface
instead of throwing an exception" - the newTemplates() does
- that, and returns null.
+ that, and returns null.
*/
if( tmpl==null ) return null;
return tmpl.newTransformer();
} catch( TransformerConfigurationException ex ) {
if( m_errorListener != null ) {
- try {
- m_errorListener.fatalError( ex );
- return null;
- } catch( TransformerException ex1 ) {
- ex=new TransformerConfigurationException( ex1 );
- }
+ try {
+ m_errorListener.fatalError( ex );
+ return null;
+ } catch( TransformerException ex1 ) {
+ ex=new TransformerConfigurationException( ex1 );
+ }
}
throw ex;
}
@@ -770,6 +771,7 @@
throw new org.xml.sax.SAXException(ex1.toString());
}
catch (NoSuchMethodError ex2){}
+ catch (AbstractMethodError ame){}
}
if (null == reader)
@@ -795,25 +797,25 @@
catch (IOException ioe)
{
if( m_errorListener != null ) {
- try {
- m_errorListener.fatalError( new TransformerException(ioe) );
- return null;
- } catch( TransformerException ex1 ) {
- throw new TransformerConfigurationException( ex1 );
- }
+ try {
+ m_errorListener.fatalError( new TransformerException(ioe) );
+ return null;
+ } catch( TransformerException ex1 ) {
+ throw new TransformerConfigurationException( ex1 );
+ }
} else
- throw new TransformerConfigurationException(ioe.getMessage(), ioe);
+ throw new TransformerConfigurationException(ioe.getMessage(), ioe);
}
catch (org.xml.sax.SAXException se)
{
if( m_errorListener != null ) {
- try {
- m_errorListener.fatalError( new TransformerException(se) );
- } catch( TransformerException ex1 ) {
- throw new TransformerConfigurationException( ex1 );
- }
+ try {
+ m_errorListener.fatalError( new TransformerException(se) );
+ } catch( TransformerException ex1 ) {
+ throw new TransformerConfigurationException( ex1 );
+ }
} else
- throw new TransformerConfigurationException(se.getMessage(), se);
+ throw new TransformerConfigurationException(se.getMessage(), se);
}
return builder.getTemplates();
1.6 +1 -0
xml-xalan/java/src/org/apache/xalan/transformer/TrAXFilter.java
Index: TrAXFilter.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/transformer/TrAXFilter.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TrAXFilter.java 2001/01/02 03:36:52 1.5
+++ TrAXFilter.java 2001/01/31 20:54:38 1.6
@@ -99,6 +99,7 @@
throw new org.xml.sax.SAXException( ex1.toString() );
} catch( NoSuchMethodError ex2 ) {
}
+ catch (AbstractMethodError ame){}
XMLReader parent;
if( reader==null )
1.6 +1 -0
xml-xalan/java/src/org/apache/xalan/transformer/TransformerIdentityImpl.java
Index: TransformerIdentityImpl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/transformer/TransformerIdentityImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TransformerIdentityImpl.java 2001/01/29 14:30:50 1.5
+++ TransformerIdentityImpl.java 2001/01/31 20:54:38 1.6
@@ -384,6 +384,7 @@
throw new org.xml.sax.SAXException(ex1.toString());
}
catch (NoSuchMethodError ex2){}
+ catch (AbstractMethodError ame){}
}
if (null == reader)
1.82 +2 -0
xml-xalan/java/src/org/apache/xalan/transformer/TransformerImpl.java
Index: TransformerImpl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/transformer/TransformerImpl.java,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- TransformerImpl.java 2001/01/31 07:29:29 1.81
+++ TransformerImpl.java 2001/01/31 20:54:39 1.82
@@ -518,6 +518,7 @@
throw new org.xml.sax.SAXException( ex1.toString() );
} catch( NoSuchMethodError ex2 ) {
}
+ catch (AbstractMethodError ame){}
}
if (null == reader)
{
@@ -890,6 +891,7 @@
throw new org.xml.sax.SAXException( ex1.toString() );
} catch( NoSuchMethodError ex2 ) {
}
+ catch (AbstractMethodError ame){}
}
if (null == reader)
1.23 +1 -0
xml-xalan/java/src/org/apache/xpath/SourceTreeManager.java
Index: SourceTreeManager.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/SourceTreeManager.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- SourceTreeManager.java 2001/01/03 10:12:07 1.22
+++ SourceTreeManager.java 2001/01/31 20:54:41 1.23
@@ -466,6 +466,7 @@
throw new org.xml.sax.SAXException( ex1.toString() );
} catch( NoSuchMethodError ex2 ) {
}
+ catch (AbstractMethodError ame){}
if(null == reader)
reader = XMLReaderFactory.createXMLReader();
}
