You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by na...@apache.org on 2008/07/18 13:25:47 UTC
svn commit: r677881 - in
/webservices/axis2/branches/java/1_4/modules/adb/src/org/apache/axis2/databinding:
types/Time.java utils/ConverterUtil.java
Author: nandana
Date: Fri Jul 18 04:25:46 2008
New Revision: 677881
URL: http://svn.apache.org/viewvc?rev=677881&view=rev
Log:
AXIS2-3916 applying the patch
Modified:
webservices/axis2/branches/java/1_4/modules/adb/src/org/apache/axis2/databinding/types/Time.java
webservices/axis2/branches/java/1_4/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java
Modified: webservices/axis2/branches/java/1_4/modules/adb/src/org/apache/axis2/databinding/types/Time.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_4/modules/adb/src/org/apache/axis2/databinding/types/Time.java?rev=677881&r1=677880&r2=677881&view=diff
==============================================================================
--- webservices/axis2/branches/java/1_4/modules/adb/src/org/apache/axis2/databinding/types/Time.java (original)
+++ webservices/axis2/branches/java/1_4/modules/adb/src/org/apache/axis2/databinding/types/Time.java Fri Jul 18 04:25:46 2008
@@ -194,8 +194,8 @@
}
}
calendar.set(Calendar.MILLISECOND, miliSecond);
-
calendar.set(Calendar.ZONE_OFFSET, timeZoneOffSet);
+ calendar.set(Calendar.DST_OFFSET, 0);
return calendar;
}
Modified: webservices/axis2/branches/java/1_4/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_4/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java?rev=677881&r1=677880&r2=677881&view=diff
==============================================================================
--- webservices/axis2/branches/java/1_4/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java (original)
+++ webservices/axis2/branches/java/1_4/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java Fri Jul 18 04:25:46 2008
@@ -160,7 +160,7 @@
}
public static void appendTimeZone(Calendar calendar, StringBuffer dateString) {
- int timezoneOffSet = calendar.get(Calendar.ZONE_OFFSET);
+ int timezoneOffSet = calendar.get(Calendar.ZONE_OFFSET) + calendar.get(Calendar.DST_OFFSET);
int timezoneOffSetInMinits = timezoneOffSet / 60000;
if (timezoneOffSetInMinits < 0){
dateString.append("-");
@@ -614,6 +614,7 @@
calendar.set(Calendar.MONTH, month - 1);
calendar.set(Calendar.DAY_OF_MONTH, day);
calendar.set(Calendar.ZONE_OFFSET, timeZoneOffSet);
+ calendar.set(Calendar.DST_OFFSET, 0);
calendar.getTimeInMillis();
if (bc){
calendar.set(Calendar.ERA, GregorianCalendar.BC);
@@ -981,6 +982,7 @@
}
calendar.set(Calendar.MILLISECOND, miliSecond);
calendar.set(Calendar.ZONE_OFFSET, timeZoneOffSet);
+ calendar.set(Calendar.DST_OFFSET, 0);
} else {
throw new NumberFormatException("date string can not be less than 19 charactors");