RESOLVED - bug 275377: TaskKeyComparator fails with NFE when task id is longer than an Integer

https://bugs.eclipse.org/bugs/show_bug.cgi?id=275377

1 files changed, 6 insertions, 1 deletions

diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskKeyComparator.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskKeyComparator.java
index 64d69d68c..1700abda3 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskKeyComparator.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskKeyComparator.java
@@ -79,7 +79,12 @@ public class TaskKeyComparator implements Comparator<String[]> {
 				if (key1.length() == key2.length() || key1.length() == 0 || key2.length() == 0) {
 					n = key1.compareTo(key2);
 				} else {
-					n = Integer.valueOf(key1).compareTo(Integer.valueOf(key2));
+					try {
+						n = Long.valueOf(key1).compareTo(Long.valueOf(key2));
+					} catch (NumberFormatException e) {
+						// The number was probably longer than an Long, so just compare them as text
+						n = key1.compareTo(key2);
+					}
 				}
 				if (n != 0) {
 					return n;