$OpenBSD: patch-jdk_src_share_classes_java_util_TimeZone_java,v 1.3 2011/01/11 15:47:50 kurt Exp $
--- jdk/src/share/classes/java/util/TimeZone.java.orig	Thu Dec 16 17:12:13 2010
+++ jdk/src/share/classes/java/util/TimeZone.java	Tue Jan  4 18:25:20 2011
@@ -805,15 +805,13 @@ abstract public class TimeZone implements Serializable
         }
         int gmtOffset =  (hours * 60 + num) * 60 * 1000;
 
+        zi = ZoneInfoFile.getCustomTimeZone(id, negative ? -gmtOffset : gmtOffset);
         if (gmtOffset == 0) {
-            zi = ZoneInfoFile.getZoneInfo(GMT_ID);
             if (negative) {
                 zi.setID("GMT-00:00");
             } else {
                 zi.setID("GMT+00:00");
             }
-        } else {
-            zi = ZoneInfoFile.getCustomTimeZone(id, negative ? -gmtOffset : gmtOffset);
         }
         return zi;
     }
