src/java.xml/share/classes/javax/xml/catalog/CatalogUriResolverImpl.java

*** 1,7 ****
  /*
!  * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  /*
!  * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
*** 63,84 ****
          href = Util.getNotNullOrEmpty(href);
          base = Util.getNotNullOrEmpty(base);
  
          if (href == null) return null;
  
          CatalogImpl c = (CatalogImpl)catalog;
          String uri = Normalizer.normalizeURI(href);
!         String result;
  
          //remove fragment if any.
          int hashPos = uri.indexOf("#");
          if (hashPos >= 0) {
              uri = uri.substring(0, hashPos);
          }
  
          //search the current catalog
          result = resolve(c, uri);
          if (result == null) {
              GroupEntry.ResolveType resolveType = c.getResolve();
              switch (resolveType) {
                  case IGNORE:
                      return new SAXSource(new InputSource(new StringReader("")));
--- 63,96 ----
          href = Util.getNotNullOrEmpty(href);
          base = Util.getNotNullOrEmpty(base);
  
          if (href == null) return null;
  
+         String result = null;
          CatalogImpl c = (CatalogImpl)catalog;
          String uri = Normalizer.normalizeURI(href);
!         //check whether uri is an urn
!         if (uri != null && uri.startsWith(Util.URN)) {
!             String publicId = Normalizer.decodeURN(uri);
!             if (publicId != null) {
!                 result = Util.resolve(c, publicId, null);
!             }
!         }
  
+         //if no match with a public id, continue search for an URI
+         if (result == null) {
              //remove fragment if any.
              int hashPos = uri.indexOf("#");
              if (hashPos >= 0) {
                  uri = uri.substring(0, hashPos);
              }
  
              //search the current catalog
              result = resolve(c, uri);
+         }
+ 
+         //Report error or return the URI as is when no match is found
          if (result == null) {
              GroupEntry.ResolveType resolveType = c.getResolve();
              switch (resolveType) {
                  case IGNORE:
                      return new SAXSource(new InputSource(new StringReader("")));