Merge pull request #2078 from APriestman/trackPointCompareNPE

Check for case where both timestamps are null.

bindings/java/src/org/sleuthkit/datamodel/blackboardutils/attributes/GeoTrackPoints.java

@@ -219,8 +219,12 @@ public Long getTimeStamp() {
 		public int compareTo(TrackPoint otherTP) {
 			Long otherTimeStamp = otherTP.getTimeStamp();
 
-			if (timestamp == null && otherTimeStamp != null) {
-				return -1;
+			if (timestamp == null) {
+				if (otherTimeStamp != null) {
+					return -1;
+				} else {
+					return 0;
+				}
 			} else if (timestamp != null && otherTimeStamp == null) {
 				return 1;
 			} else {