You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by ay...@apache.org on 2008/07/19 14:06:12 UTC
svn commit: r678143 -
/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/TimeZones.java
Author: ayza
Date: Sat Jul 19 05:06:12 2008
New Revision: 678143
URL: http://svn.apache.org/viewvc?rev=678143&view=rev
Log:
Committing fix for HARMONY-5909 ([classlib][luni] Incorrect values with Asia/Colombo Time Zone)
Modified:
harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/TimeZones.java
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/TimeZones.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/TimeZones.java?rev=678143&r1=678142&r2=678143&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/TimeZones.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/TimeZones.java Sat Jul 19 05:06:12 2008
@@ -19,7 +19,8 @@
final class TimeZones {
- private static final int ONE_HOUR = 3600000;
+ private static final int HALF_HOUR = 1800000;
+ private static final int ONE_HOUR = HALF_HOUR * 2;
public static TimeZone[] getTimeZones() {
return new TimeZone[] {
@@ -582,7 +583,7 @@
new SimpleTimeZone(6 * ONE_HOUR, "Asia/Almaty", Calendar.MARCH,//$NON-NLS-1$
-1, Calendar.SUNDAY, 0 * ONE_HOUR, Calendar.OCTOBER,
-1, Calendar.SUNDAY, 0 * ONE_HOUR),
- new SimpleTimeZone(6 * ONE_HOUR, "Asia/Colombo"),//$NON-NLS-1$
+ new SimpleTimeZone(5 * ONE_HOUR + HALF_HOUR, "Asia/Colombo"),//$NON-NLS-1$
new SimpleTimeZone(6 * ONE_HOUR, "Asia/Dacca"),//$NON-NLS-1$
new SimpleTimeZone(6 * ONE_HOUR, "Asia/Dhaka"),//$NON-NLS-1$
new SimpleTimeZone(6 * ONE_HOUR,