elena 2003/01/22 07:00:53
Modified: java/src/org/apache/xerces/dom AttrNSImpl.java
ElementNSImpl.java
Log:
Additional fixes related the bug:
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=16235
Revision Changes Path
1.35 +2 -2 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.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- AttrNSImpl.java 21 Jan 2003 17:54:57 -0000 1.34
+++ AttrNSImpl.java 22 Jan 2003 15:00:53 -0000 1.35
@@ -131,7 +131,7 @@
if (qname.equals("xmlns")
&& (namespaceURI == null
||
!namespaceURI.equals(NamespaceContext.XMLNS_URI))
- ||
(namespaceURI.equals(NamespaceContext.XMLNS_URI)
+ || (namespaceURI!=null &&
namespaceURI.equals(NamespaceContext.XMLNS_URI)
&& !qname.equals("xmlns"))) {
String msg =
DOMMessageFormatter.formatMessage(
1.31 +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.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- ElementNSImpl.java 21 Jan 2003 17:54:57 -0000 1.30
+++ ElementNSImpl.java 22 Jan 2003 15:00:53 -0000 1.31
@@ -119,7 +119,7 @@
this.namespaceURI = namespaceURI;
if (namespaceURI != null) {
this.namespaceURI =
- (namespaceURI.length() == 0) ? null :
namespaceURI.intern();
+ (namespaceURI.length() == 0) ? null : namespaceURI;
}
int colon1 = qname.indexOf(':');
int colon2 = qname.lastIndexOf(':');
@@ -131,7 +131,7 @@
if (qname.equals("xmlns")
&& (namespaceURI == null
||
!namespaceURI.equals(NamespaceContext.XMLNS_URI))
- || (namespaceURI.equals(NamespaceContext.XMLNS_URI)
+ || (namespaceURI!=null &&
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]
