[java-xmltooling COMMIT] in /branches/REL_1: doc/RELEASE-NOTES.txt src/main/java/org/opensaml/xml/parse/ClasspathReso...

[noreply at shibboleth.net]

Author: putmanb
Date: Thu Dec 12 04:40:36 2013
New Revision: 813

URL: http://svn.shibboleth.net/view/java-xmltooling?rev=813&view=rev
Log:
JXT-104: ClasspathResolver doesn't set systemId on resolved InputSources failing subsequent resolutions

Modified:
    branches/REL_1/doc/RELEASE-NOTES.txt
    branches/REL_1/src/main/java/org/opensaml/xml/parse/ClasspathResolver.java

Modified: branches/REL_1/doc/RELEASE-NOTES.txt
URL: http://svn.shibboleth.net/view/java-xmltooling/branches/REL_1/doc/RELEASE-NOTES.txt?rev=813&r1=812&r2=813&view=diff
==============================================================================
--- branches/REL_1/doc/RELEASE-NOTES.txt (original)
+++ branches/REL_1/doc/RELEASE-NOTES.txt Thu Dec 12 04:40:36 2013
@@ -2,6 +2,7 @@
 =============================================
 [JXT-102] - Decrypter should be defensive about Santuario and Java crypto classes throwing unchecked exceptions 
 [JXT-103] - XMLTooling failed to pass veracode due Use of Wrong Operator in String Comparison (CWE ID 597) 
+[JXT-104] - ClasspathResolver doesn't set systemId on resolved InputSources failing subsequent resolutions
 [JXT-105] - DefaultBootstrap unexpectedly uses a parser StaticBasicParserPool with expandEntityReferences set to true
 
 Changes in Release 1.4.0

Modified: branches/REL_1/src/main/java/org/opensaml/xml/parse/ClasspathResolver.java
URL: http://svn.shibboleth.net/view/java-xmltooling/branches/REL_1/src/main/java/org/opensaml/xml/parse/ClasspathResolver.java?rev=813&r1=812&r2=813&view=diff
==============================================================================
--- branches/REL_1/src/main/java/org/opensaml/xml/parse/ClasspathResolver.java (original)
+++ branches/REL_1/src/main/java/org/opensaml/xml/parse/ClasspathResolver.java Thu Dec 12 04:40:36 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;