From dcda2c5fa15e63daad67f5720a2f726e34f8cd71 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Thu, 20 Dec 2018 20:11:57 -0500
Subject: [PATCH] Fix out of memory crash with TimeUnit.
---
timeflow/data/time/TimeUnit.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/timeflow/data/time/TimeUnit.java b/timeflow/data/time/TimeUnit.java
index bbba6e1..0eb149f 100755
--- a/timeflow/data/time/TimeUnit.java
+++ b/timeflow/data/time/TimeUnit.java
@@ -13,7 +13,7 @@
public static final TimeUnit HOUR = new TimeUnit("Hours", Calendar.HOUR_OF_DAY, 60 * 60 * 1000L, "HH:mm", "MMM d yyyy HH:mm");
public static final TimeUnit MINUTE = new TimeUnit("Minutes", Calendar.MINUTE, 60 * 1000L, ":mm", "MMM d yyyy HH:mm");
public static final TimeUnit SECOND = new TimeUnit("Seconds", Calendar.SECOND, 1000L, ":ss", "MMM d yyyy HH:mm:ss");
- public static final TimeUnit REALTIME = new TimeUnit("Realtime", Calendar.MILLISECOND, 8L, ":SSS", "MMM d yyyy HH:mm:ss:SSS");
+ public static final TimeUnit REALTIME = new TimeUnit("Realtime", Calendar.MILLISECOND, 1L, ":SS", "HH:mm:ss.SS");
public static final TimeUnit DECADE = multipleYears(10);
public static final TimeUnit CENTURY = multipleYears(100);
@@ -101,7 +101,7 @@
}
private static final int[] calendarUnits =
{
- Calendar.SECOND, Calendar.MINUTE, Calendar.HOUR_OF_DAY, Calendar.DAY_OF_MONTH, Calendar.MONTH, Calendar.YEAR
+ Calendar.MILLISECOND, Calendar.SECOND, Calendar.MINUTE, Calendar.HOUR_OF_DAY, Calendar.DAY_OF_MONTH, Calendar.MONTH, Calendar.YEAR
};
public RoughTime round(long timestamp, boolean up)
@@ -128,7 +128,7 @@
}
if (i == calendarUnits.length - 1)
{
- throw new IllegalArgumentException("Unsupported Calendar Unit: " + calendarCode);
+ //throw new IllegalArgumentException("Unsupported Calendar Unit: " + calendarCode);
}
c.set(calendarUnits[i], c.getMinimum(calendarUnits[i]));
}
--
Gitblit v1.6.2