You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by mu...@apache.org on 2010/07/24 19:17:15 UTC
svn commit: r978904 - in
/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces:
impl/xs/opti/SchemaDOMParser.java util/NamespaceSupport.java
Author: mukulg
Date: Sat Jul 24 17:17:14 2010
New Revision: 978904
URL: http://svn.apache.org/viewvc?rev=978904&view=rev
Log:
reverting changes from NamespaceSupport.java and making corresponding fix to the calling code
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/opti/SchemaDOMParser.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/util/NamespaceSupport.java
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/opti/SchemaDOMParser.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/opti/SchemaDOMParser.java?rev=978904&r1=978903&r2=978904&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/opti/SchemaDOMParser.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/opti/SchemaDOMParser.java Sat Jul 24 17:17:14 2010
@@ -780,7 +780,7 @@ public class SchemaDOMParser extends Def
typeOrFacetRawValue.indexOf(':') + 1);
String typeOrFacetPrefix = typeOrFacetRawValue.substring(0,
typeOrFacetRawValue.indexOf(':'));
- typeOrFacetUri = fNamespaceContext.getURI(typeOrFacetPrefix);
+ typeOrFacetUri = fNamespaceContext.getURI(typeOrFacetPrefix.intern());
}
else {
typeOrFacetLocalName = typeOrFacetRawValue;
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/util/NamespaceSupport.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/util/NamespaceSupport.java?rev=978904&r1=978903&r2=978904&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/util/NamespaceSupport.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/util/NamespaceSupport.java Sat Jul 24 17:17:14 2010
@@ -189,7 +189,7 @@ public class NamespaceSupport implements
// find prefix in current context
for (int i = fNamespaceSize; i > 0; i -= 2) {
- if (prefix.equals(fNamespace[i - 2])) {
+ if (fNamespace[i - 2] == prefix) {
return fNamespace[i - 1];
}
}
@@ -208,7 +208,7 @@ public class NamespaceSupport implements
// find uri in current context
for (int i = fNamespaceSize; i > 0; i -= 2) {
if (uri.equals(fNamespace[i - 1])) {
- if (uri.equals(getURI(fNamespace[i - 2])))
+ if (getURI(fNamespace[i - 2]) == uri)
return fNamespace[i - 2];
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org