santiagopg 2002/07/20 16:46:14
Modified: java/src/org/apache/xalan/xsltc/trax
TransformerFactoryImpl.java
Log:
Accept null as a possible return value from URIResolver.resolve()
Revision Changes Path
1.43 +6 -7
xml-xalan/java/src/org/apache/xalan/xsltc/trax/TransformerFactoryImpl.java
Index: TransformerFactoryImpl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/trax/TransformerFactoryImpl.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- TransformerFactoryImpl.java 26 Jun 2002 22:55:07 -0000 1.42
+++ TransformerFactoryImpl.java 20 Jul 2002 23:46:13 -0000 1.43
@@ -699,15 +699,14 @@
public InputSource loadSource(String href, String context, XSLTC xsltc) {
try {
final Source source = _uriResolver.resolve(href, context);
- final InputSource input = getInputSource(xsltc, source);
- return(input);
- }
- catch (TransformerConfigurationException e) {
- return null;
+ if (source != null) {
+ return getInputSource(xsltc, source);
+ }
}
catch (TransformerException e) {
- return null;
+ // Falls through
}
+ return null;
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
