Changeset 336 for trunk/EventBenchCore/src/de/ugoe/cs/eventbench/data/Event.java

Timestamp:

12/20/11 13:37:14 (13 years ago)

Author:

sherbold

Message:

• made de.ugoe.cs.eventbench.data.Event and ReplayableEvent? more robust against incorrect usage, with focus on incorrect subclassing. Especially unexpected null values are now handled more reliably.

File:

• trunk/EventBenchCore/src/de/ugoe/cs/eventbench/data/Event.java (modified) (2 diffs)

trunk/EventBenchCore/src/de/ugoe/cs/eventbench/data/Event.java

@@ -96 +96 @@
                 if (other instanceof Event<?>) {
                         Event<?> otherEvent = (Event<?>) other;
-                        if (target != null) {
-                                return type.equals(otherEvent.type)
-                                                && target.equals(otherEvent.target);
+                        if (otherEvent.canEqual(this)) {
+                                if (type != null && target != null) {
+                                        return type.equals(otherEvent.type)
+                                                        && target.equals(otherEvent.target);
+                                } else if (type != null && target == null) {
+                                        return type.equals(otherEvent.type)
+                                                        && otherEvent.target == null;
+                                } else if (type == null && target != null) {
+                                        return otherEvent.type == null
+                                                        && target.equals(otherEvent.target);
+                                } else {
+                                        return otherEvent.type == null && otherEvent.target == null;
+                                }
                         } else {
-                                return type.equals(otherEvent.type)
-                                                && otherEvent.target == null;
+                                return false;
                         }
                 } else {
                         return false;
                 }
+        }
+
+        public boolean canEqual(Object other) {
+                return (other instanceof Event<?>);
         }
 
@@ -216 +229 @@
                 int multiplier = 17;
                 int hash = 42;
-                hash = multiplier * hash + type.hashCode();
+                if (type != null) {
+                        hash = multiplier * hash + type.hashCode();
+                }
                 if (target != null) {
                         hash = multiplier * hash + target.hashCode();