Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 93978 invoked from network); 29 Nov 2003 16:12:09 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 29 Nov 2003 16:12:09 -0000 Received: (qmail 8424 invoked by uid 500); 29 Nov 2003 16:12:01 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 8401 invoked by uid 500); 29 Nov 2003 16:12:00 -0000 Mailing-List: contact axis-dev-help@ws.apache.org; run by ezmlm Precedence: bulk Reply-To: axis-dev@ws.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list axis-dev@ws.apache.org Received: (qmail 8390 invoked by uid 500); 29 Nov 2003 16:12:00 -0000 Delivered-To: apmail-ws-axis-cvs@apache.org Date: 29 Nov 2003 16:12:05 -0000 Message-ID: <20031129161205.93961.qmail@minotaur.apache.org> From: dims@apache.org To: ws-axis-cvs@apache.org Subject: cvs commit: ws-axis/java/src/org/apache/axis/encoding/ser SimpleDeserializer.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N 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; }