Sorry for late reply. Actually this is a problem with the patch (674525)
itself. I could reproduce your issue by changing the timeZone to EST.
the 674447 Anyway I have reverted with a new patch. So if the attached patch
works with your jdk it is ok.
Please confirm.
thanks,
Amila.
On Tue, Jul 8, 2008 at 5:32 PM, Davanum Srinivas <[EMAIL PROTECTED]> wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Amila, Deepal,
>
> I've reverted svn commits 674447 and 674525 as this causes a integration
> test case failure in the IBM JDK5/6
>
> Can you please submit a JIRA / test case then we can work on making sure
> the issue is fixed across all JDK's.
>
> -
> -------------------------------------------------------------------------------
> Test set:
> org.apache.axis2.rpc.complex.ComplexDataTypesComplexDataTypesSOAP11Test
> -
> -------------------------------------------------------------------------------
> Tests run: 37, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 81.149 sec
> <<< FAILURE!
> testretDateTime(org.apache.axis2.rpc.complex.ComplexDataTypesComplexDataTypesSOAP11Test)
> Time elapsed: 2.034 sec <<<
> FAILURE!
> junit.framework.ComparisonFailure: null
> expected:<2008-07-08T1[4]:31:44.551Z> but was:<2008-07-08T1[5]:31:44.551Z>
> at junit.framework.Assert.assertEquals(Assert.java:81)
> at junit.framework.Assert.assertEquals(Assert.java:87)
> at
>
> org.apache.axis2.rpc.complex.ComplexDataTypesComplexDataTypesSOAP11Test.testretDateTime(ComplexDataTypesComplexDataTypesSOAP11Test.java:359)
> at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
> at
> sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:45)
> at
> sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
> at java.lang.reflect.Method.invoke(Method.java:599)
>
> thanks,
> dims
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.6 (GNU/Linux)
>
> iD8DBQFIc9zagNg6eWEDv1kRApsFAKCi3fthzpBqrCY1M03vG8ndooR0hQCdHE5g
> cvcelxH2YKlHAMP2ywMHOMg=
> =LIKi
> -----END PGP SIGNATURE-----
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: [EMAIL PROTECTED]
> For additional commands, e-mail: [EMAIL PROTECTED]
>
>
--
Amila Suriarachchi,
WSO2 Inc.
Index: src/org/apache/axis2/databinding/utils/ConverterUtil.java
===================================================================
--- src/org/apache/axis2/databinding/utils/ConverterUtil.java (revision
676483)
+++ src/org/apache/axis2/databinding/utils/ConverterUtil.java (working copy)
@@ -608,14 +608,13 @@
}
Calendar calendar = Calendar.getInstance();
- int dsTimeOffset = calendar.get(Calendar.DST_OFFSET);
calendar.clear();
calendar.set(Calendar.YEAR, year);
//xml month stars from the 1 and calendar month is starts with 0
calendar.set(Calendar.MONTH, month - 1);
calendar.set(Calendar.DAY_OF_MONTH, day);
- calendar.set(Calendar.ZONE_OFFSET, timeZoneOffSet - dsTimeOffset);
- calendar.set(Calendar.DST_OFFSET, dsTimeOffset);
+ calendar.set(Calendar.ZONE_OFFSET, timeZoneOffSet);
+ calendar.set(Calendar.DST_OFFSET, 0);
calendar.getTimeInMillis();
if (bc){
calendar.set(Calendar.ERA, GregorianCalendar.BC);
@@ -868,7 +867,6 @@
// '-'? yyyy '-' mm '-' dd 'T' hh ':' mm ':' ss ('.' s+)? (zzzzzz)?
Date date = null;
Calendar calendar = Calendar.getInstance();
- int dsTimeOffset = calendar.get(Calendar.DST_OFFSET);
calendar.clear();
@@ -984,8 +982,8 @@
}
}
calendar.set(Calendar.MILLISECOND, miliSecond);
- calendar.set(Calendar.ZONE_OFFSET, timeZoneOffSet - dsTimeOffset);
- calendar.set(Calendar.DST_OFFSET, dsTimeOffset);
+ calendar.set(Calendar.ZONE_OFFSET, timeZoneOffSet);
+ calendar.set(Calendar.DST_OFFSET, 0);
Index: src/org/apache/axis2/databinding/types/Time.java
===================================================================
--- src/org/apache/axis2/databinding/types/Time.java (revision 676483)
+++ src/org/apache/axis2/databinding/types/Time.java (working copy)
@@ -99,7 +99,6 @@
source = source.trim();
Calendar calendar = Calendar.getInstance();
- int dsTimeOffset = calendar.get(Calendar.DST_OFFSET);
calendar.clear();
int hour = 0;
int minite = 0;
@@ -196,10 +195,9 @@
}
}
calendar.set(Calendar.MILLISECOND, miliSecond);
+ calendar.set(Calendar.ZONE_OFFSET, timeZoneOffSet);
+ calendar.set(Calendar.DST_OFFSET, 0);
- calendar.set(Calendar.ZONE_OFFSET, timeZoneOffSet - dsTimeOffset);
- calendar.set(Calendar.DST_OFFSET, dsTimeOffset);
-
return calendar;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
