[utilities COMMIT] /java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/xml/ClasspathResolver.java

[noreply at shibboleth.net]

Author: putmanb
Date: Thu Dec 12 04:45:09 2013
New Revision: 485

URL: http://svn.shibboleth.net/view/utilities?rev=485&view=rev
Log:
Port from v2: JXT-104: ClasspathResolver doesn't set systemId on resolved InputSources failing subsequent resolutions 

Modified:
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/xml/ClasspathResolver.java

Modified: java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/xml/ClasspathResolver.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/xml/ClasspathResolver.java?rev=485&r1=484&r2=485&view=diff
==============================================================================
--- java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/xml/ClasspathResolver.java (original)
+++ java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/xml/ClasspathResolver.java Thu Dec 12 04:45:09 2013
@@ -51,7 +51,10 @@
     public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException {
         InputStream resourceStream = resolver(publicId, systemId);
         if (resourceStream != null) {
-            return new InputSource(resourceStream);
+            InputSource is = new InputSource(resourceStream);
+            is.setSystemId(systemId);
+            is.setPublicId(publicId);
+            return is;
         }
 
         return null;