$OpenBSD: patch-j2se_src_share_classes_java_util_TimeZone_java,v 1.1 2007/09/06 15:46:19 kurt Exp $
--- j2se/src/share/classes/java/util/TimeZone.java.orig	Thu Jul  5 05:00:58 2007
+++ j2se/src/share/classes/java/util/TimeZone.java	Fri Jul 27 18:24:24 2007
@@ -780,15 +780,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;
     }
