axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject cvs commit: ws-axis/java/src/org/apache/axis/encoding/ser SimpleDeserializer.java
Date Sat, 29 Nov 2003 16:12:05 GMT
dims        2003/11/29 08:12:05

  Modified:    java/src/org/apache/axis/encoding/ser
                        SimpleDeserializer.java
  Log:
  Fix for Bug 19330 - Empty String deserialization + fix
  from dhauver@vecna.com (Dave Hauver)
  
  Revision  Changes    Path
  1.35      +1 -5      ws-axis/java/src/org/apache/axis/encoding/ser/SimpleDeserializer.java
  
  Index: SimpleDeserializer.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/encoding/ser/SimpleDeserializer.java,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- SimpleDeserializer.java	5 Sep 2003 17:58:52 -0000	1.34
  +++ SimpleDeserializer.java	29 Nov 2003 16:12:05 -0000	1.35
  @@ -88,7 +88,6 @@
    */
   public class SimpleDeserializer extends DeserializerImpl {
   
  -    //StringBuffer val = new StringBuffer(); -- FIX http://nagoya.apache.org/bugzilla/show_bug.cgi?id=11945
       private final CharArrayWriter val = new CharArrayWriter();
       private Constructor constructor = null;
       private Map propertyMap = null;
  @@ -149,7 +148,6 @@
        * Reset deserializer for re-use
        */
       public void reset() {
  -        //val.setLength(0); // Reset string buffer back to zero -- FIX http://nagoya.apache.org/bugzilla/show_bug.cgi?id=11945
           val.reset();
           attributeMap = null; // Remove attribute map
           isNil = false; // Don't know if nil
  @@ -197,7 +195,6 @@
       public void characters(char [] chars, int start, int end)
           throws SAXException
       {
  -        //val.append(chars, start, end); -- FIX http://nagoya.apache.org/bugzilla/show_bug.cgi?id=11945
           val.write(chars,start,end);
       }
       
  @@ -209,8 +206,7 @@
                              DeserializationContext context)
           throws SAXException
       {
  -        //if (isNil || val == null) {  -- FIX http://nagoya.apache.org/bugzilla/show_bug.cgi?id=11945
  -        if (isNil) {
  +        if (isNil || (val.size() == 0 && javaType != java.lang.String.class)) {
               value = null;
               return;
           }
  
  
  

Mime
View raw message