Return-Path: Delivered-To: apmail-ws-axis-cvs-archive@www.apache.org Received: (qmail 7658 invoked from network); 13 Jun 2005 13:42:49 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 13 Jun 2005 13:42:49 -0000 Received: (qmail 16742 invoked by uid 500); 13 Jun 2005 13:42:48 -0000 Delivered-To: apmail-ws-axis-cvs-archive@ws.apache.org Received: (qmail 16686 invoked by uid 500); 13 Jun 2005 13:42:48 -0000 Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list axis-cvs@ws.apache.org Received: (qmail 16673 invoked by uid 99); 13 Jun 2005 13:42:47 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Mon, 13 Jun 2005 06:42:47 -0700 Received: (qmail 7227 invoked by uid 1994); 13 Jun 2005 13:42:22 -0000 Date: 13 Jun 2005 13:42:22 -0000 Message-ID: <20050613134222.7226.qmail@minotaur.apache.org> From: venkat@apache.org To: ws-axis-cvs@apache.org Subject: cvs commit: ws-axis/java/src/org/apache/axis/encoding/ser DateDeserializer.java X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N venkat 2005/06/13 06:42:22 Modified: java/src/org/apache/axis/encoding/ser DateDeserializer.java Log: checking in a slightly modified patch for AXIS-1456 - support javax.sql.Date deserialization. Revision Changes Path 1.15 +9 -6 ws-axis/java/src/org/apache/axis/encoding/ser/DateDeserializer.java Index: DateDeserializer.java =================================================================== RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/encoding/ser/DateDeserializer.java,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- DateDeserializer.java 7 Feb 2005 14:48:11 -0000 1.14 +++ DateDeserializer.java 13 Jun 2005 13:42:22 -0000 1.15 @@ -87,14 +87,17 @@ if (bc) { calendar.setTime((Date)result); calendar.set(Calendar.ERA, GregorianCalendar.BC); - if(javaType == Date.class) { - result = calendar.getTime(); - } else { - result = calendar; - } + result = calendar.getTime(); + } + if (javaType == java.util.Date.class) { + return result; + } else if (javaType == java.sql.Date.class) { + result = new java.sql.Date(((Date)result).getTime()); + } else { + calendar.setTime((Date)result); + result = calendar; } } - return result; } } \ No newline at end of file