Author: mrowe
Date: 2004-06-15 19:33:21 +1200 (Tue, 15 Jun 2004)
New Revision: 159
Modified:
trunk/msn/notificationserver.cpp
Log:
Don't disconnect ourselves twice on object destruction.
Modified: trunk/msn/notificationserver.cpp
===================================================================
--- trunk/msn/notificationserver.cpp 2004-06-15 07:32:19 UTC (rev 158)
+++ trunk/msn/notificationserver.cpp 2004-06-15 07:33:21 UTC (rev 159)
@@ -59,13 +59,8 @@
NotificationServerConnection::~NotificationServerConnection()
{
- ext::closingConnection(this);
- std::list<SwitchboardServerConnection *> list =
_switchboardConnections;
- std::list<SwitchboardServerConnection *>::iterator i = list.begin();
- for (; i != list.end(); i++)
- {
- delete *i;
- }
+ if (connectionStatus != NS_DISCONNECTED)
+ this->disconnect();
}
Connection *NotificationServerConnection::connectionWithSocket(int fd)
-------------------------------------------------------
This SF.Net email is sponsored by The 2004 JavaOne(SM) Conference
Learn from the experts at JavaOne(SM), Sun's Worldwide Java Developer
Conference, June 28 - July 1 at the Moscone Center in San Francisco, CA
REGISTER AND SAVE! http://java.sun.com/javaone/sf Priority Code NWMGYKND
|
