You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by an...@apache.org on 2001/08/03 09:39:51 UTC

cvs commit: xml-xerces/java/src/org/apache/xerces/impl XMLNamespaceBinder.java

andyc       01/08/03 00:39:51

  Modified:    java/src/org/apache/xerces/impl Tag: xerces_j_2
                        XMLNamespaceBinder.java
  Log:
  Namespace binding bug. Hopefully that fixes it.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.14  +7 -3      xml-xerces/java/src/org/apache/xerces/impl/Attic/XMLNamespaceBinder.java
  
  Index: XMLNamespaceBinder.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/Attic/XMLNamespaceBinder.java,v
  retrieving revision 1.1.2.13
  retrieving revision 1.1.2.14
  diff -u -r1.1.2.13 -r1.1.2.14
  --- XMLNamespaceBinder.java	2001/07/26 08:03:36	1.1.2.13
  +++ XMLNamespaceBinder.java	2001/08/03 07:39:51	1.1.2.14
  @@ -95,7 +95,7 @@
    *
    * @author Andy Clark, IBM
    *
  - * @version $Id: XMLNamespaceBinder.java,v 1.1.2.13 2001/07/26 08:03:36 andyc Exp $
  + * @version $Id: XMLNamespaceBinder.java,v 1.1.2.14 2001/08/03 07:39:51 andyc Exp $
    */
   public class XMLNamespaceBinder 
       implements XMLComponent, XMLDocumentHandler {
  @@ -511,7 +511,7 @@
                                 ? attributes.getLocalName(i) : fEmptySymbol;
                   String uri = attributes.getValue(i);
                   uri = fSymbolTable.addSymbol(uri);
  -                fNamespaceSupport.declarePrefix(prefix, uri);
  +                fNamespaceSupport.declarePrefix(prefix, uri.length() != 0 ? uri : null);
   
                   // call handler
                   if (fDocumentHandler != null) {
  @@ -622,7 +622,11 @@
       public void endElement(QName element) throws XNIException {
   
           // bind element
  -        element.uri = fNamespaceSupport.getURI(element.prefix);
  +        String eprefix = element.prefix != null ? element.prefix : fEmptySymbol;
  +        element.uri = fNamespaceSupport.getURI(eprefix);
  +        if (element.uri != null) {
  +            element.prefix = eprefix;
  +        }
           
           // call handlers
           if (fDocumentHandler != null && !fOnlyPassPrefixMappingEvents) {
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org