Changeset 1599 for trunk/autoquest-plugin-http/src/main/java/de/ugoe/cs/autoquest/plugin/http/eventcore/HTTPEventType.java

Timestamp:

07/11/14 11:58:34 (10 years ago)

Author:

pharms

Message:

• equals check for SOAP events

File:

• trunk/autoquest-plugin-http/src/main/java/de/ugoe/cs/autoquest/plugin/http/eventcore/HTTPEventType.java (modified) (2 diffs)

trunk/autoquest-plugin-http/src/main/java/de/ugoe/cs/autoquest/plugin/http/eventcore/HTTPEventType.java

@@ -136 +136 @@
             HTTPEventType other = (HTTPEventType) obj;
             
+            if (!other.getClass().isAssignableFrom(this.getClass())) {
+                return false;
+            }
+            
+            if (exchange == null) {
+                return other.exchange == null;
+            }
+            else if (other.exchange == null) {
+                return false;
+            }
+            
             HttpRequest request1 = exchange.getRequest();
             HttpRequest request2 = other.exchange.getRequest();
             
-            return (HTTPUtils.equals(exchange.getSender(), other.exchange.getSender()) &&
-                    HTTPUtils.equals(exchange.getReceiver(), other.exchange.getReceiver()) &&
+            // do not compare the sender, as this may change
+            return (HTTPUtils.equals(exchange.getReceiver(), other.exchange.getReceiver()) &&
                     HTTPUtils.equals(request1.getMethod(), request2.getMethod()) &&
                     HTTPUtils.equals(request1.getProtocol(), request2.getProtocol()) &&
@@ -155 +166 @@
     @Override
     public int hashCode() {
-        return
-            exchange.getRequest().getMethod().hashCode() +
-            exchange.getRequest().getProtocol().hashCode() +
-            exchange.getRequest().getUrl().hashCode();
+        if (exchange != null) {
+            return
+                exchange.getRequest().getMethod().hashCode() +
+                exchange.getRequest().getProtocol().hashCode() +
+                exchange.getRequest().getUrl().hashCode();
+        }
+        else {
+            return 0;
+        }
     }