Changeset 3312 for code/trunk

Timestamp:

Jul 19, 2009, 2:36:46 PM (15 years ago)

Author:

scheusso

Message:

fix in disconnect behaviour

Location:

code/trunk/src/network

Files:

• ServerConnection.cc (modified) (1 diff)
• TrafficControl.cc (modified) (1 diff)

code/trunk/src/network/ServerConnection.cc

@@ -125 +125 @@
     ClientInformation *temp = ClientInformation::getBegin();
     while(temp!=0){
-      disconnectPeer( &event );
+      disconnectClient( temp );
       temp = temp->next();
     }

code/trunk/src/network/TrafficControl.cc

@@ -314 +314 @@
   void TrafficControl::clientDisconnected(unsigned int clientID)
   {
-    assert(clientListTemp_.find(clientID) != clientListTemp_.end() );
-    assert(clientListPerm_.find(clientID) != clientListPerm_.end() );
+    if( clientListPerm_.find(clientID) == clientListPerm_.end() )
+    {
+      assert(!this->bActive_);
+      return;
+    }
     clientListTemp_.erase(clientListTemp_.find(clientID));
-    clientListPerm_.erase(clientListPerm_.find(clientID));
+    if( clientListTemp_.find(clientID) != clientListTemp_.end() )
+      clientListPerm_.erase(clientListPerm_.find(clientID));
   }