bug 59805: avoid memory leaks if time zone or locale are never set or user never resets the time zone or locale; patch from apptaro

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1751739 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 20 insertions, 26 deletions

diff --git a/src/java/org/apache/poi/util/LocaleUtil.java b/src/java/org/apache/poi/util/LocaleUtil.java
index 54a8d6c0ec..81bdd4a079 100644
--- a/src/java/org/apache/poi/util/LocaleUtil.java
+++ b/src/java/org/apache/poi/util/LocaleUtil.java
@@ -52,21 +52,8 @@ public final class LocaleUtil {
      */

     public static final Charset CHARSET_1252 = Charset.forName("CP1252");

 

-    private static final ThreadLocal<TimeZone> userTimeZone = new ThreadLocal<TimeZone>() {

-        @Override

-        @SuppressForbidden("implementation around default locales in POI")

-        protected TimeZone initialValue() {

-            return TimeZone.getDefault();

-        }

-    };

-

-    private static final ThreadLocal<Locale> userLocale = new ThreadLocal<Locale>() {

-        @Override

-        @SuppressForbidden("implementation around default locales in POI")

-        protected Locale initialValue() {

-            return Locale.getDefault();

-        }

-    };

+    private static final ThreadLocal<TimeZone> userTimeZone = new ThreadLocal<TimeZone>();

+    private static final ThreadLocal<Locale> userLocale = new ThreadLocal<Locale>();

     

     /**

      * As time zone information is not stored in any format, it can be

@@ -80,12 +67,17 @@ public final class LocaleUtil {
     }

     

     /**

-     * @return the time zone which is used for date calculations, defaults to UTC

-     */

+     * @return the time zone which is used for date calculations. If not set, returns {@link TimeZone#getDefault()}.

+     */
+    @SuppressForbidden("implementation around default locales in POI")

     public static TimeZone getUserTimeZone() {

-        return userTimeZone.get();

+        TimeZone timeZone = userTimeZone.get();
+        return (timeZone != null) ? timeZone : TimeZone.getDefault();

     }

-    

+
+    /**
+     * Clear the thread-local user time zone.
+     */    

     public static void resetUserTimeZone() {

         userTimeZone.remove();

     }

@@ -98,15 +90,17 @@ public final class LocaleUtil {
         userLocale.set(locale);

     }

     

-    public static void resetUserLocale() {

-        userLocale.remove();

-    }

-

     /**

-     * @return the default user locale, defaults to {@link Locale#ROOT}

-     */

+     * @return the default user locale. If not set, returns {@link Locale#getDefault()}.

+     */
+    @SuppressForbidden("implementation around default locales in POI")

     public static Locale getUserLocale() {

-        return userLocale.get();

+        Locale locale = userLocale.get();
+        return (locale != null) ? locale : Locale.getDefault();

+    }
+
+    public static void resetUserLocale() {

+        userLocale.remove();

     }

 

     /**