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

ICU-7427 Fix to normalize month/year values in Islamic calendar when doing an add in the calendar

Browse Source 
X-SVN-Rev: 29688
This commit is contained in:
John Emmons 2011-03-23 19:48:37 +00:00
parent 18cf8134b5
commit 6b98037d5d
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
icu4j/main/classes/core/src/com/ibm/icu/util/IslamicCalendar.java
View File

@ -1,6 +1,6 @@
/*
*******************************************************************************
* Copyright (C) 1996-2010, International Business Machines Corporation and *
* Copyright (C) 1996-2011, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/
@ -414,11 +414,15 @@ public class IslamicCalendar extends Calendar {
* @param month The hijri month, 0-based
*/
private long monthStart(int year, int month) {
// Normalize year/month in case month is outside the normal bounds, which may occur
// in the case of an add operation
int realYear = year + month / 12;
int realMonth = month % 12;
if (civil) {
return (long)Math.ceil(29.5*month)
+ (year-1)*354 + (long)Math.floor((3+11*year)/30.0);
return (long)Math.ceil(29.5*realMonth)
+ (realYear-1)*354 + (long)Math.floor((3+11*realYear)/30.0);
} else {
return trueMonthStart(12*(year-1) + month);
return trueMonthStart(12*(realYear-1) + realMonth);
}
}