2004-09-07 Jeroen Frijters <jeroen@frijters.net>

        * java/util/TimeZone.java
        (getDefaultTimeZone): Fixed test to distinguish between hours and
        minutes in specified timezone.

2 files changed, 7 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 4c6cebe64..ce93e33f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-09-07  Jeroen Frijters  <jeroen@frijters.net>
+
+	* java/util/TimeZone.java
+	(getDefaultTimeZone): Fixed test to distinguish between hours and
+	minutes in specified timezone.
+
 2004-09-06  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	* java/awt/Canvas.java
diff --git a/java/util/TimeZone.java b/java/util/TimeZone.java
index 772f89305..1e06e5356 100644
--- a/java/util/TimeZone.java
+++ b/java/util/TimeZone.java
@@ -884,7 +884,7 @@ public abstract class TimeZone implements java.io.Serializable, Cloneable
 	// Offset could be in hours or seconds.  Convert to millis.
 	// The offset is given as the time to add to local time to get GMT
 	// we need the time to add to GMT to get localtime.
-	if (gmtOffset < 24)
+	if (Math.abs(gmtOffset) < 24)
 	  gmtOffset *= 60 * 60;
 	gmtOffset *= -1000;
       }