src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHandlerImpl.java

*** 1,15 ****
  /*
!  * reserved comment block
!  * DO NOT REMOVE OR ALTER!
   */
  /*
!  * Copyright 2005 The Apache Software Foundation.
!  *
!  * Licensed under the Apache License, Version 2.0 (the "License");
!  * you may not use this file except in compliance with the License.
!  * You may obtain a copy of the License at
   *
   *      http://www.apache.org/licenses/LICENSE-2.0
   *
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
--- 1,15 ----
  /*
!  * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
   */
  /*
!  * Licensed to the Apache Software Foundation (ASF) under one or more
!  * contributor license agreements.  See the NOTICE file distributed with
!  * this work for additional information regarding copyright ownership.
!  * The ASF licenses this file to You under the Apache License, Version 2.0
!  * (the "License"); you may not use this file except in compliance with
!  * the License.  You may obtain a copy of the License at
   *
   *      http://www.apache.org/licenses/LICENSE-2.0
   *
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
*** 69,78 ****
--- 69,80 ----
  import com.sun.org.apache.xerces.internal.xs.AttributePSVI;
  import com.sun.org.apache.xerces.internal.xs.ElementPSVI;
  import com.sun.org.apache.xerces.internal.xs.ItemPSVI;
  import com.sun.org.apache.xerces.internal.xs.PSVIProvider;
  import com.sun.org.apache.xerces.internal.xs.XSTypeDefinition;
+ import javax.xml.catalog.CatalogFeatures;
+ import jdk.xml.internal.JdkXmlUtils;
  import org.w3c.dom.TypeInfo;
  import org.w3c.dom.ls.LSInput;
  import org.w3c.dom.ls.LSResourceResolver;
  import org.xml.sax.Attributes;
  import org.xml.sax.ContentHandler;
*** 699,708 ****
--- 701,713 ----
                             } catch (SAXException exc) {
                                 XMLSecurityManager.printWarning(reader.getClass().getName(),
                                         XMLConstants.ACCESS_EXTERNAL_DTD, exc);
                             }
                          }
+ 
+                         // Passing on the CatalogFeatures settings from a configuration object to the reader
+                         JdkXmlUtils.catalogFeaturesConfig2Reader(fComponentManager, reader);
                      } catch( Exception e ) {
                          // this is impossible, but better safe than sorry
                          throw new FactoryConfigurationError(e);
                      }
                  }
*** 1044,1054 ****
                       * with the DOM Level 3 Load and Save Recommendation
                       * use the same lookup order here.
                       */
                      InputSource inputSource = new InputSource();
                      inputSource.setPublicId(pubId);
!                     inputSource.setSystemId((baseSystemId != null) ? resolveSystemId(systemId, baseSystemId) : systemId);
  
                      if (charStream != null) {
                          inputSource.setCharacterStream(charStream);
                      }
                      else if (byteStream != null) {
--- 1049,1059 ----
                       * with the DOM Level 3 Load and Save Recommendation
                       * use the same lookup order here.
                       */
                      InputSource inputSource = new InputSource();
                      inputSource.setPublicId(pubId);
!                     inputSource.setSystemId((baseSystemId != null) ? resolveSystemId(sysId, baseSystemId) : sysId);
  
                      if (charStream != null) {
                          inputSource.setCharacterStream(charStream);
                      }
                      else if (byteStream != null) {