1 files changed, 5 insertions, 4 deletions
diff --git a/st/TokenKey.java b/st/TokenKey.java
index 54086c5..941c83f 100644
--- a/st/TokenKey.java
+++ b/st/TokenKey.java
@@ -29,11 +29,12 @@ public class TokenKey {
         boolean ret = false;
         TokenKey o;
         if (other instanceof TokenKey &&
-            (o = (TokenKey) other).name == this.name &&
-            o.cls == this.cls &&
-            o.mtd == this.mtd) {
+            (o = (TokenKey) other).name.equals(this.name) &&
+            ((o.cls == null && this.cls == null) ||
+             (o.cls != null && o.cls.equals(this.cls))) &&
+            ((o.mtd == null && this.mtd == null) ||
+             (o.mtd != null && o.mtd.equals(this.mtd))))
             ret = true;
-        }
         return ret;
     }