提交 1506da48 编写于 作者: O okutsu

6932473: (tz) javazic produces incorrect SimpleTimeZone parameters with Sun<=7

Reviewed-by: peytoia
上级 db17c56c
...@@ -139,7 +139,7 @@ class RuleDay { ...@@ -139,7 +139,7 @@ class RuleDay {
if (isLast()) { if (isLast()) {
return -1; return -1;
} }
return getDay(); return isEarlier() ? -getDay() : getDay();
} }
/** /**
...@@ -147,13 +147,10 @@ class RuleDay { ...@@ -147,13 +147,10 @@ class RuleDay {
* @return the SimpleTimeZone day-of-week rule value * @return the SimpleTimeZone day-of-week rule value
*/ */
int getDayOfWeekForSimpleTimeZoneInt() { int getDayOfWeekForSimpleTimeZoneInt() {
if (!isLater() && !isEarlier() && !isLast()) { if (isEarlier() || isLater()) {
return 0;
}
if (isLater()) {
return -getDayOfWeekNum(); return -getDayOfWeekNum();
} }
return getDayOfWeekNum(); return isLast() ? getDayOfWeekNum() : 0;
} }
/** /**
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册