Changeset 3705 for source/ariba/communication

Timestamp:

May 26, 2009, 4:27:55 PM (15 years ago)

Author:

Christoph Mayer

Message:

-einige fixed bzgl. link management, fehlerhafte serialisierer, etc.

Location:

source/ariba/communication

Files:

• EndpointDescriptor.cpp (modified) (1 diff)
• EndpointDescriptor.h (modified) (1 diff)

source/ariba/communication/EndpointDescriptor.cpp

@@ -112 +112 @@
 bool EndpointDescriptor::operator==(const EndpointDescriptor& rh) const {
 
-        if( locator != NULL && rh.locator != NULL )
-                return ( locator->operator==(*rh.locator) );
+        if( isUnspecified() && rh.isUnspecified() ) {
 
-        if( locator != rh.locator )
+                // both unspec bit set
+                return true;
+
+        } else if( (!isUnspecified()) && (!rh.isUnspecified()) ) {
+
+                //
+                // both are valid, check locators
+                //
+
+                if( locator == NULL && rh.locator == NULL ){
+
+                        // both locators are invalid, ok true
+                        return true;
+
+                } else if( locator == NULL ^ rh.locator == NULL ) {
+
+                        // one locator is invalid, the other not, false
+                        return false;
+
+                } else {
+
+                        // both locators are valid, compare
+                        assert( locator != NULL && rh.locator != NULL );
+                        return ( locator->operator==(*rh.locator) );
+
+                }
+
+        } else {
+
+                // one is unspec, the other not
+                assert( isUnspecified() ^ rh.isUnspecified() );
                 return false;
 
-        return (isUnspec == rh.isUnspec);
+        }
+
 }
 

source/ariba/communication/EndpointDescriptor.h

@@ -100 +100 @@
 
 sznBeginDefault( ariba::communication::EndpointDescriptor, X ) {
-        X && VO(locator);
+        uint8_t unspec = isUnspec;
+
+        X && unspec && VO(locator);
+
+        // when deserializing reset unspec flag
+        if (X.isDeserializer()) isUnspec = unspec;
 } sznEnd();