Got rid of Long.compare(...). Not in Java 6.

j256 · May 10, 2017 · d7ad068 · d7ad068
1 parent 9cbcf3a
commit d7ad068
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/src/main/java/com/j256/cloudwatchlogbackappender/CloudWatchAppender.java b/src/main/java/com/j256/cloudwatchlogbackappender/CloudWatchAppender.java
@@ -620,7 +620,19 @@ private LoggingEvent makeEvent(Level level, String message, Throwable th) {
 	private static class InputLogEventComparator implements Comparator<InputLogEvent> {
 		@Override
 		public int compare(InputLogEvent o1, InputLogEvent o2) {
-			return Long.compare(o1.getTimestamp(), o2.getTimestamp());
+			if (o1.getTimestamp() == null) {
+				if (o2.getTimestamp() == null) {
+					return 0;
+				} else {
+					// null - long
+					return -1;
+				}
+			} else if (o2.getTimestamp() == null) {
+				// long - null
+				return 1;
+			} else {
+				return o1.getTimestamp().compareTo(o2.getTimestamp());
+			}
 		}
 	}
 }
diff --git a/src/main/javadoc/doc-files/changelog.txt b/src/main/javadoc/doc-files/changelog.txt
@@ -1,3 +1,6 @@
+1.10: 5/10/2017
+	* Got rid of Long.compare(...).  Not in Java 6.
+
 1.9: 5/10/2017
 	* Create the Cloudwatch log-group and log-stream using reflection to hack around the AWS SDK incompatibility.