You are viewing a plain text version of this content. The canonical link for it is here.
Posted to soap-dev@ws.apache.org by ne...@locus.apache.org on 2000/11/07 02:30:10 UTC

cvs commit: xml-soap/java/src/org/apache/soap AttributeHandler.java

neyama      00/11/06 17:30:10

  Modified:    java/src/org/apache/soap AttributeHandler.java
  Log:
  Bug fix for NullPointerException.
  
  Revision  Changes    Path
  1.4       +9 -3      xml-soap/java/src/org/apache/soap/AttributeHandler.java
  
  Index: AttributeHandler.java
  ===================================================================
  RCS file: /home/cvs/xml-soap/java/src/org/apache/soap/AttributeHandler.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- AttributeHandler.java	2000/09/01 03:52:39	1.3
  +++ AttributeHandler.java	2000/11/07 01:30:09	1.4
  @@ -129,6 +129,8 @@
   
     private String getPrefixFromURI(String namespaceURI)
     {
  +    if ("" == namespaceURI) return null ;
  +
       String nsPrefix = (String)namespaceURIs2Prefixes.get(namespaceURI);
   
       if (nsPrefix == null)
  @@ -154,7 +156,8 @@
         String namespaceURI = (String)e.nextElement();
         String namespacePrefix = getPrefixFromURI(namespaceURI);
   
  -      nsStack.addNSDeclaration(namespacePrefix, namespaceURI);
  +      if (namespacePrefix != null)
  +        nsStack.addNSDeclaration(namespacePrefix, namespaceURI);
       }
     }
   
  @@ -208,8 +211,11 @@
       {
         QName attrQName = (QName)attrQNames.nextElement();
   
  -      sink.write(' ' + getPrefixFromURI(attrQName.getNamespaceURI()) +
  -                 ':' + attrQName.getLocalPart() + "=\"" +
  +      sink.write(' ') ;
  +      String nsPrefix ;
  +      if ((nsPrefix = getPrefixFromURI(attrQName.getNamespaceURI())) != null)
  +        sink.write(nsPrefix + ':') ;
  +      sink.write(attrQName.getLocalPart() + "=\"" +
                    getAttribute(attrQName) + '\"');
       }
     }