From 7b18561d407f4769a46ecf58531e6e45c2c0bb06 Mon Sep 17 00:00:00 2001
From: Sloth <sloth@cardforge.org>
Date: Wed, 11 Jul 2012 20:16:28 +0000
Subject: [PATCH] - Added some null checks to TableSorter.

---
 src/main/java/forge/gui/deckeditor/tables/TableSorter.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/main/java/forge/gui/deckeditor/tables/TableSorter.java b/src/main/java/forge/gui/deckeditor/tables/TableSorter.java
index 620ee1ddccf..03c345ecc01 100644
--- a/src/main/java/forge/gui/deckeditor/tables/TableSorter.java
+++ b/src/main/java/forge/gui/deckeditor/tables/TableSorter.java
@@ -76,6 +76,12 @@ public class TableSorter<T> implements Comparator<Entry<T, Integer>> {
     public final int compare(final Entry<T, Integer> arg0, final Entry<T, Integer> arg1) {
         final Comparable obj1 = this.field.apply(arg0);
         final Comparable obj2 = this.field.apply(arg1);
+        if (obj1 == null) {
+            return -1;
+        }
+        if (obj2 == null) {
+            return 1;
+        }
         //System.out.println(String.format("%s vs %s _______ %s vs %s", arg0, arg1, obj1, obj2));
         return this.ascending ? obj1.compareTo(obj2) : obj2.compareTo(obj1);
     }