You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by mr...@apache.org on 2004/01/16 16:08:12 UTC
cvs commit: xml-xerces/java/src/org/apache/xerces/impl XMLEntityManager.java
mrglavas 2004/01/16 07:08:12
Modified: java/src/org/apache/xerces/impl XMLEntityManager.java
Log:
Fixing Bug #23768:
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=23768
With the standard-uri-conformant feature enabled, if the user
has provided an input source without a system id the entity
manager should not replace it with the current working
directory.
Revision Changes Path
1.70 +9 -2 xml-xerces/java/src/org/apache/xerces/impl/XMLEntityManager.java
Index: XMLEntityManager.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/XMLEntityManager.java,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- XMLEntityManager.java 18 Nov 2003 21:47:35 -0000 1.69
+++ XMLEntityManager.java 16 Jan 2004 15:08:12 -0000 1.70
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999-2003 The Apache Software Foundation.
+ * Copyright (c) 1999-2004 The Apache Software Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -1598,6 +1598,13 @@
// system id has to be a valid URI
if (strict) {
+
+ // check if there is a system id before
+ // trying to expand it.
+ if (systemId == null) {
+ return null;
+ }
+
try {
// if it's already an absolute one, return it
URI uri = new URI(systemId);
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org