Fix for Bug#99292 (Bug#31195955), Contribution: Support Windows time zone \'Coordinated Universal Time\'.

Change-Id: Ib7b992d0a51d30ff6a9ca9175181b5f35bd48188

Author: fjssilva

CHANGES

@@ -3,6 +3,9 @@
 
 Version 9.5.0
 
+  - Fix for Bug#99292 (Bug#31195955), Contribution: Support Windows time zone \'Coordinated Universal Time\'.
+    Thanks to Frédéric Barrière for his contribution.
+
   - Fix for Bug#107094 (Bug#34104230), NullPointerException when calling equals with null on MultiHostConnectionProxy.
 
   - Fix for Bug#107543 (Bug#34464351), Cannot execute a SELECT statement that writes to an OUTFILE.

src/main/core-api/java/com/mysql/cj/util/TimeUtil.java

@@ -132,25 +132,23 @@ public static long getCurrentTimeNanosOrMillis() {
     /**
      * Returns the 'official' Java timezone name for the given timezone
      *
-     * @param timezoneStr
+     * @param timeZoneStr
      *            the 'common' timezone name
      * @param exceptionInterceptor
      *            exception interceptor
      *
      * @return the Java timezone name for the given timezone
      */
-    public static String getCanonicalTimeZone(String timezoneStr, ExceptionInterceptor exceptionInterceptor) {
-        if (timezoneStr == null) {
+    public static String getCanonicalTimeZone(String timeZoneStr, ExceptionInterceptor exceptionInterceptor) {
+        if (timeZoneStr == null) {
             return null;
         }
 
-        timezoneStr = timezoneStr.trim();
+        timeZoneStr = timeZoneStr.trim();
 
-        // handle '+/-hh:mm' form ...
-        if (timezoneStr.length() > 2) {
-            if ((timezoneStr.charAt(0) == '+' || timezoneStr.charAt(0) == '-') && Character.isDigit(timezoneStr.charAt(1))) {
-                return "GMT" + timezoneStr;
-            }
+        // Handle '+/-hh:mm' form.
+        if (timeZoneStr.length() > 2 && (timeZoneStr.charAt(0) == '+' || timeZoneStr.charAt(0) == '-') && Character.isDigit(timeZoneStr.charAt(1))) {
+            return "GMT" + timeZoneStr;
         }
 
         LOCK.lock();
@@ -162,13 +160,13 @@ public static String getCanonicalTimeZone(String timezoneStr, ExceptionIntercept
             LOCK.unlock();
         }
 
-        String canonicalTz;
-        if ((canonicalTz = timeZoneMappings.getProperty(timezoneStr)) != null) {
+        String canonicalTz = timeZoneMappings.getProperty(timeZoneStr);
+        if (canonicalTz != null) {
             return canonicalTz;
         }
 
         throw ExceptionFactory.createException(InvalidConnectionAttributeException.class,
-                Messages.getString("TimeUtil.UnrecognizedTimeZoneId", new Object[] { timezoneStr }), exceptionInterceptor);
+                Messages.getString("TimeUtil.UnrecognizedTimeZoneId", new Object[] { timeZoneStr }), exceptionInterceptor);
     }
 
     /**
@@ -329,11 +327,9 @@ private static void loadTimeZoneMappings(ExceptionInterceptor exceptionIntercept
         } catch (IOException e) {
             throw ExceptionFactory.createException(Messages.getString("TimeUtil.LoadTimeZoneMappingError"), exceptionInterceptor);
         }
-        // bridge all Time Zone ids known by Java
+        // Bridge all Time Zones known by Java.
         for (String tz : TimeZone.getAvailableIDs()) {
-            if (!timeZoneMappings.containsKey(tz)) {
-                timeZoneMappings.put(tz, tz);
-            }
+            timeZoneMappings.put(tz, tz);
         }
     }