You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by sa...@apache.org on 2012/03/30 15:47:35 UTC
svn commit: r1307420 - in /axis/axis2/java/core/branches/1_6: ./
modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java
modules/adb/test/org/apache/axis2/databinding/utils/ConverterUtilTest.java
Author: sagara
Date: Fri Mar 30 13:47:35 2012
New Revision: 1307420
URL: http://svn.apache.org/viewvc?rev=1307420&view=rev
Log:
AXIS2-5275 - Merged r1307410 to the 1.6 branch.
Modified:
axis/axis2/java/core/branches/1_6/ (props changed)
axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java
axis/axis2/java/core/branches/1_6/modules/adb/test/org/apache/axis2/databinding/utils/ConverterUtilTest.java
Propchange: axis/axis2/java/core/branches/1_6/
------------------------------------------------------------------------------
Merged /axis/axis2/java/core/trunk:r1307410
Modified: axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java?rev=1307420&r1=1307419&r2=1307420&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java Fri Mar 30 13:47:35 2012
@@ -587,7 +587,7 @@ public class ConverterUtil {
if (restpart.startsWith("Z")) {
// this is a gmt time zone value
timeZoneOffSet = 0;
- } else if (restpart.startsWith("+") || restpart.startsWith("-")) {
+ } else if (restpart.startsWith("+") || restpart.startsWith("-") || restpart.startsWith("T")) {
// this is a specific time format string
if (restpart.charAt(3) != ':'){
throw new RuntimeException("invalid time zone format (" + source
Modified: axis/axis2/java/core/branches/1_6/modules/adb/test/org/apache/axis2/databinding/utils/ConverterUtilTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb/test/org/apache/axis2/databinding/utils/ConverterUtilTest.java?rev=1307420&r1=1307419&r2=1307420&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/adb/test/org/apache/axis2/databinding/utils/ConverterUtilTest.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/adb/test/org/apache/axis2/databinding/utils/ConverterUtilTest.java Fri Mar 30 13:47:35 2012
@@ -162,6 +162,17 @@ public class ConverterUtilTest extends T
System.out.println("String ==> " + "2007-02-15-12:30");
System.out.println("calendar ==> " + simpleDateFormat.format(date));
System.out.println("calendar ==> " + ConverterUtil.convertToString(date));
+
+ //Included two new tests from here http://www.w3.org/TR/NOTE-datetime
+ date = ConverterUtil.convertToDate("2011-11-05T08:15:30-05:00");
+ System.out.println("String ==> " + "2011-11-05T08:15:30-05:00");
+ System.out.println("calendar ==> " + simpleDateFormat.format(date));
+ System.out.println("calendar ==> " + ConverterUtil.convertToString(date));
+
+ date = ConverterUtil.convertToDate("1994-11-05T13:15:30Z");
+ System.out.println("String ==> " + "1994-11-05T13:15:30Z");
+ System.out.println("calendar ==> " + simpleDateFormat.format(date));
+ System.out.println("calendar ==> " + ConverterUtil.convertToString(date));
}