From 61995b9270bb58f70fd01828d8ab4f613e7199c3 Mon Sep 17 00:00:00 2001
From: Masayoshi Okutsu <okutsu@openjdk.org>
Date: Wed, 10 Mar 2010 14:32:47 +0900
Subject: [PATCH] 6932473: (tz) javazic produces incorrect SimpleTimeZone
 parameters with Sun<=7

Reviewed-by: peytoia
---
 jdk/make/tools/src/build/tools/javazic/RuleDay.java | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/jdk/make/tools/src/build/tools/javazic/RuleDay.java b/jdk/make/tools/src/build/tools/javazic/RuleDay.java
index f9629b77d88..88e7062578f 100644
--- a/jdk/make/tools/src/build/tools/javazic/RuleDay.java
+++ b/jdk/make/tools/src/build/tools/javazic/RuleDay.java
@@ -139,7 +139,7 @@ class RuleDay {
         if (isLast()) {
             return -1;
         }
-        return getDay();
+        return isEarlier() ? -getDay() : getDay();
     }
 
     /**
@@ -147,13 +147,10 @@ class RuleDay {
      * @return the SimpleTimeZone day-of-week rule value
      */
     int getDayOfWeekForSimpleTimeZoneInt() {
-        if (!isLater() && !isEarlier() && !isLast()) {
-            return 0;
-        }
-        if (isLater()) {
+        if (isEarlier() || isLater()) {
             return -getDayOfWeekNum();
         }
-        return getDayOfWeekNum();
+        return isLast() ? getDayOfWeekNum() : 0;
     }
 
     /**