Author: mrglavas
Date: Thu May 18 12:45:53 2006
New Revision: 407624
URL: http://svn.apache.org/viewvc?rev=407624&view=rev
Log:
Attempting to fix a bug where a schema document is loaded
multiple times if it is both included and redefined. Depending
on the ordering, Xerces may overwrite the redefined components
with the original ones.
Modified:
xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java
Modified:
xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java
URL:
http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java?rev=407624&r1=407623&r2=407624&view=diff
==============================================================================
--- xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java
(original)
+++ xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java
Thu May 18 12:45:53 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2005 The Apache Software Foundation.
+ * Copyright 1999-2006 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.
@@ -2666,17 +2666,17 @@
XSDKey key = (XSDKey)obj;
// condition 1: both are redefine
- if (referType == XSDDescription.CONTEXT_REDEFINE ||
+ /** if (referType == XSDDescription.CONTEXT_REDEFINE ||
key.referType == XSDDescription.CONTEXT_REDEFINE) {
if (referType != key.referType)
return false;
- }
+ }**/
// condition 2: same namespace
if (referNS != key.referNS)
return false;
- // condition 3: same non-null locatoin
+ // condition 3: same non-null location
if (systemId == null || !systemId.equals(key.systemId)) {
return false;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
