Index: source/ariba/communication/EndpointDescriptor.h
===================================================================
--- source/ariba/communication/EndpointDescriptor.h	(revision 5406)
+++ source/ariba/communication/EndpointDescriptor.h	(revision 5412)
@@ -111,10 +111,12 @@
 	bool operator==(const EndpointDescriptor& rh) const {
 		if (rh.isUnspecified() && isUnspecified()) return true;
+		if (rh.isUnspecified() ^  isUnspecified()) return false;
+
+		assert( (!rh.isUnspecified()) && (!isUnspecified()) );
 		return endpoints == rh.endpoints;
 	}
 
 	bool operator!=(const EndpointDescriptor& rh) const {
-		if (!rh.isUnspecified() && !isUnspecified()) return true;
-		return endpoints != rh.endpoints;
+		return ( !operator==(rh) );
 	}