src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java

*** 58,70 ****
  import java.util.HashMap;
  import java.util.Map;
  import java.util.Properties;
  import java.util.StringTokenizer;
  import javax.xml.XMLConstants;
  import javax.xml.catalog.CatalogFeatures;
  import javax.xml.catalog.CatalogManager;
! import javax.xml.catalog.CatalogUriResolver;
  import javax.xml.parsers.DocumentBuilder;
  import javax.xml.parsers.DocumentBuilderFactory;
  import javax.xml.parsers.ParserConfigurationException;
  import javax.xml.stream.XMLEventReader;
  import javax.xml.stream.XMLStreamReader;
--- 58,71 ----
  import java.util.HashMap;
  import java.util.Map;
  import java.util.Properties;
  import java.util.StringTokenizer;
  import javax.xml.XMLConstants;
+ import javax.xml.catalog.CatalogException;
  import javax.xml.catalog.CatalogFeatures;
  import javax.xml.catalog.CatalogManager;
! import javax.xml.catalog.CatalogResolver;
  import javax.xml.parsers.DocumentBuilder;
  import javax.xml.parsers.DocumentBuilderFactory;
  import javax.xml.parsers.ParserConfigurationException;
  import javax.xml.stream.XMLEventReader;
  import javax.xml.stream.XMLStreamReader;
*** 222,232 ****
       */
      private Map<String, Object> _parameters = null;
  
      // Catalog features
      CatalogFeatures _catalogFeatures;
!     CatalogUriResolver _catalogUriResolver;
  
      // Catalog is enabled by default
      boolean _useCatalog = true;
  
  
--- 223,233 ----
       */
      private Map<String, Object> _parameters = null;
  
      // Catalog features
      CatalogFeatures _catalogFeatures;
!     CatalogResolver _catalogUriResolver;
  
      // Catalog is enabled by default
      boolean _useCatalog = true;
  
  
*** 1335,1345 ****
              }
  
              if (resolvedSource == null && _useCatalog &&
                      _catalogFeatures.get(CatalogFeatures.Feature.FILES) != null)  {
                  if (_catalogUriResolver == null) {
!                     _catalogUriResolver = CatalogManager.catalogUriResolver(_catalogFeatures);
                  }
                  resolvedSource = _catalogUriResolver.resolve(href, baseURI);
              }
  
              if (resolvedSource == null)  {
--- 1336,1346 ----
              }
  
              if (resolvedSource == null && _useCatalog &&
                      _catalogFeatures.get(CatalogFeatures.Feature.FILES) != null)  {
                  if (_catalogUriResolver == null) {
!                     _catalogUriResolver = CatalogManager.catalogResolver(_catalogFeatures);
                  }
                  resolvedSource = _catalogUriResolver.resolve(href, baseURI);
              }
  
              if (resolvedSource == null)  {
*** 1348,1358 ****
                  return getDOM(streamSource) ;
              }
  
              return getDOM(resolvedSource);
          }
!         catch (TransformerException e) {
              if (_errorListener != null)
                  postErrorToListener("File not found: " + e.getMessage());
              return(null);
          }
      }
--- 1349,1359 ----
                  return getDOM(streamSource) ;
              }
  
              return getDOM(resolvedSource);
          }
!         catch (TransformerException | CatalogException e) {
              if (_errorListener != null)
                  postErrorToListener("File not found: " + e.getMessage());
              return(null);
          }
      }