PatchSet 5586 
Date: 2005/02/21 23:05:13
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with  GNU Classpath: sven's date forma fix

005-02-20  Dalibor Topic  <[EMAIL PROTECTED]>

        Resynced with GNU Classpath.

        2005-02-20  Sven de Marothy <[EMAIL PROTECTED]>

        * java/text/SimpleDateFormat.java,
        (parse): Set DST_OFFSET to the correct value.

Members: 
        ChangeLog:1.3630->1.3631 
        libraries/javalib/java/text/SimpleDateFormat.java:1.47->1.48 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3630 kaffe/ChangeLog:1.3631
--- kaffe/ChangeLog:1.3630      Mon Feb 21 22:49:05 2005
+++ kaffe/ChangeLog     Mon Feb 21 23:05:13 2005
@@ -2,6 +2,15 @@
 
        Resynced with GNU Classpath.
 
+       2005-02-20  Sven de Marothy <[EMAIL PROTECTED]>
+
+        * java/text/SimpleDateFormat.java,
+        (parse): Set DST_OFFSET to the correct value.
+
+2005-02-20  Dalibor Topic  <[EMAIL PROTECTED]>
+
+       Resynced with GNU Classpath.
+
        2005-02-20  Mark Wielaard  <[EMAIL PROTECTED]>
 
         * java/text/SimpleDateFormat.java
Index: kaffe/libraries/javalib/java/text/SimpleDateFormat.java
diff -u kaffe/libraries/javalib/java/text/SimpleDateFormat.java:1.47 
kaffe/libraries/javalib/java/text/SimpleDateFormat.java:1.48
--- kaffe/libraries/javalib/java/text/SimpleDateFormat.java:1.47        Mon Feb 
21 22:49:08 2005
+++ kaffe/libraries/javalib/java/text/SimpleDateFormat.java     Mon Feb 21 
23:05:17 2005
@@ -1019,7 +1019,11 @@
                            found_zone = true;
                            saw_timezone = true;
                            TimeZone tz = TimeZone.getTimeZone (strings[0]);
-                           calendar.set (Calendar.DST_OFFSET, 
tz.getDSTSavings());
+                           // Check if it's a DST zone or ordinary 
+                           if(k == 3 || k == 4)
+                             calendar.set (Calendar.DST_OFFSET, 
tz.getDSTSavings());
+                           else
+                             calendar.set (Calendar.DST_OFFSET, 0);
                             offset = tz.getRawOffset ();
                            pos.setIndex(index + strings[k].length());
                            break;

_______________________________________________
kaffe mailing list
[email protected]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

Reply via email to