Version 19.2, December 2018

[GpsPrune.git] / tim / prune / data / TimestampLocal.java

diff --git a/tim/prune/data/TimestampLocal.java b/tim/prune/data/TimestampLocal.java
index d4c909328262d526a9c499aa4f7723175d4b00e4..30f886173dc9844b1c45093ce5357a297cd8580d 100644 (file)
--- a/tim/prune/data/TimestampLocal.java
+++ b/tim/prune/data/TimestampLocal.java
@@ -91,14 +91,17 @@ public class TimestampLocal extends Timestamp
        /**
         * Utility method for formatting dates / times
         * @param inFormat formatter object
-        * @param inTimezone timezone to use
+        * @param inTimezone timezone to use, or null
         * @return formatted String
         */
        @Override
        protected String format(DateFormat inFormat, TimeZone inTimezone)
        {
                Calendar cal = getCalendar(inTimezone);
-               inFormat.setTimeZone(inTimezone);
+               if (inTimezone != null)
+               {
+                       inFormat.setTimeZone(inTimezone);
+               }
                return inFormat.format(cal.getTime());
        }
 }