Don't apply offset if zero

headius · Sep 9, 2023 · 8036491 · 8036491
1 parent e716169
commit 8036491
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/core/src/main/java/org/jruby/RubyTime.java b/core/src/main/java/org/jruby/RubyTime.java
@@ -410,7 +410,9 @@ public static DateTimeZone getTimeZoneWithOffset(Ruby runtime, String zoneName,
         // validate_zone_name
         zoneName = zoneName.trim();
 
-        String zone = zoneName + offset;
+        String zone = zoneName;
+
+        if (offset != 0) zone = zone + offset;
 
         DateTimeZone cachedZone = runtime.getTimezoneCache().get(zone);
         if (cachedZone != null) {
@@ -431,9 +433,13 @@ public static DateTimeZone getTimeZoneWithOffset(Ruby runtime, String zoneName,
     private static DateTimeZone timeZoneWithOffset(String zoneName, int offset) {
         if (zoneName.isEmpty()) {
             return DateTimeZone.forOffsetMillis(offset);
-        } else {
-            return new FixedDateTimeZone(zoneName, null, offset, offset);
+        } else if (offset == 0) {
+            DateTimeZone zone = DateTimeZone.forID(zoneName);
+
+            if (zone != null) return zone;
         }
+
+        return new FixedDateTimeZone(zoneName, null, offset, offset);
     }
 
     public RubyTime(Ruby runtime, RubyClass rubyClass) {