AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-5280 Fix for setRawOffset problem

Browse Source 
X-SVN-Rev: 21090
This commit is contained in:
Yoshito Umaoka 2007-02-23 18:30:25 +00:00
parent 52d4dd5103
commit 679c542026
1 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
icu4j/src/com/ibm/icu/impl/OlsonTimeZone.java
View File

@ -1,6 +1,6 @@
/*
*******************************************************************************
* Copyright (C) 2005-2006, International Business Machines Corporation and *
* Copyright (C) 2005-2007, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/
@ -165,7 +165,11 @@ public class OlsonTimeZone extends TimeZone {
* @see com.ibm.icu.util.TimeZone#setRawOffset(int)
*/
public void setRawOffset(int offsetMillis) {
finalZone.setRawOffset(offsetMillis);
if (finalZone == null) {
finalRawOffset = new Integer(offsetMillis);
} else {
finalZone.setRawOffset(offsetMillis);
}
}
public Object clone() {
OlsonTimeZone other = (OlsonTimeZone) super.clone();
@ -219,6 +223,14 @@ public class OlsonTimeZone extends TimeZone {
double secs = Math.floor(date / MILLIS_PER_SECOND);
getHistoricalOffset(secs, local, offsets);
if (finalRawOffset != null) {
// When raw offset is set by setRawOffset and no "finalZone" available,
// finalRawOffset store the offset. setRawOffset no longer makes sense
// in OlsonTimeZone, but it's a public API and need to do something
// reasonable.
offsets[0] = finalRawOffset.intValue();
}
return;
}
double[] floorDivide(double dividend, double divisor) {
@ -624,6 +636,15 @@ public class OlsonTimeZone extends TimeZone {
*/
private SimpleTimeZone finalZone = null; // owned, may be NULL
/**
* When absense of finalZone, finalRawOffset stores user defined
* raw offset set by setRawOffset. This timezone implementation
* supports historical transitions, so setting raw offset does
* not make sense much. However, we need to make the API
* setRawOffset/getRawOffset work reasonably (ticket#5280)
*/
private Integer finalRawOffset = null;
private static final boolean DEBUG = ICUDebug.enabled("olson");
private static final int[] DAYS_BEFORE = new int[] {0,31,59,90,120,151,181,212,243,273,304,334,
0,31,60,91,121,152,182,213,244,274,305,335};