elena 2003/01/21 09:54:57
Modified: java/src/org/apache/xerces/dom AttrNSImpl.java
CoreDocumentImpl.java ElementNSImpl.java
Log:
Fixing bug: http://nagoya.apache.org/bugzilla/show_bug.cgi?id=16235
Revision Changes Path
1.34 +4 -4 xml-xerces/java/src/org/apache/xerces/dom/AttrNSImpl.java
Index: AttrNSImpl.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/dom/AttrNSImpl.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- AttrNSImpl.java 16 Jan 2003 22:53:44 -0000 1.33
+++ AttrNSImpl.java 21 Jan 2003 17:54:57 -0000 1.34
@@ -117,7 +117,7 @@
this.namespaceURI = namespaceURI;
if (namespaceURI !=null) {
this.namespaceURI = (namespaceURI.length() == 0)? null
- : namespaceURI.intern();
+ : namespaceURI;
}
int colon1 = qname.indexOf(':');
@@ -130,8 +130,8 @@
if (ownerDocument().errorChecking) {
if (qname.equals("xmlns")
&& (namespaceURI == null
- || namespaceURI !=
NamespaceContext.XMLNS_URI)
- || (namespaceURI == NamespaceContext.XMLNS_URI
+ ||
!namespaceURI.equals(NamespaceContext.XMLNS_URI))
+ ||
(namespaceURI.equals(NamespaceContext.XMLNS_URI)
&& !qname.equals("xmlns"))) {
String msg =
DOMMessageFormatter.formatMessage(
1.39 +4 -4 xml-xerces/java/src/org/apache/xerces/dom/CoreDocumentImpl.java
Index: CoreDocumentImpl.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/dom/CoreDocumentImpl.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- CoreDocumentImpl.java 7 Jan 2003 20:59:52 -0000 1.38
+++ CoreDocumentImpl.java 21 Jan 2003 17:54:57 -0000 1.39
@@ -2123,7 +2123,7 @@
throw new DOMException(DOMException.NAMESPACE_ERR,
msg);
}
else if (prefix.equals("xml")
- && namespace != NamespaceContext.XML_URI) {
+ &&
!namespace.equals(NamespaceContext.XML_URI)) {
String msg =
DOMMessageFormatter.formatMessage(
DOMMessageFormatter.DOM_DOMAIN,
@@ -2133,9 +2133,9 @@
}
else if (
prefix.equals("xmlns")
- && namespace != NamespaceContext.XMLNS_URI
+ &&
!namespace.equals(NamespaceContext.XMLNS_URI)
|| (!prefix.equals("xmlns")
- && namespace ==
NamespaceContext.XMLNS_URI)) {
+ &&
namespace.equals(NamespaceContext.XMLNS_URI))) {
String msg =
DOMMessageFormatter.formatMessage(
DOMMessageFormatter.DOM_DOMAIN,
1.30 +3 -3 xml-xerces/java/src/org/apache/xerces/dom/ElementNSImpl.java
Index: ElementNSImpl.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/dom/ElementNSImpl.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ElementNSImpl.java 16 Jan 2003 22:53:44 -0000 1.29
+++ ElementNSImpl.java 21 Jan 2003 17:54:57 -0000 1.30
@@ -130,8 +130,8 @@
ownerDocument().checkQName(null, localName);
if (qname.equals("xmlns")
&& (namespaceURI == null
- || namespaceURI != NamespaceContext.XMLNS_URI)
- || (namespaceURI == NamespaceContext.XMLNS_URI
+ ||
!namespaceURI.equals(NamespaceContext.XMLNS_URI))
+ || (namespaceURI.equals(NamespaceContext.XMLNS_URI)
&& !qname.equals("xmlns"))) {
String msg =
DOMMessageFormatter.formatMessage(
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
