Changeset 444a2f for src/Observer/Relay.cpp

Timestamp:

Dec 23, 2011, 10:14:52 AM (14 years ago)

Author:

Frederik Heber <heber@…>

Children:

f16f05

Parents:

760f97c

Message:

Fix to Relay::recieveNotifications() for not caring for present Channels or not.

• We do not ascertain presence of Channels, if there are none, nothing is sent on.

File:

• src/Observer/Relay.cpp (modified) (1 diff)

src/Observer/Relay.cpp

@@ -210 +210 @@
 {
   Updater = publisher;
-  const Channels *myChannels = NotificationChannels[const_cast<Observable *>(static_cast<const Observable * const>(this))];
-  ASSERT(myChannels != NULL,
-      "Relay::recieveNotification() - this relay does not have any channels.");
-  const size_t channelno = notification->getChannelNo();
-  Notification_ptr mynotification = myChannels->getChannel(channelno);
-  ASSERT(mynotification != NULL,
-      "Relay::recieveNotification() - this relay does not have a notification no "+toString(channelno)+".");
-  mynotification->notifyAll(Updater);
-  Updater = NULL;
+  ChannelMap::const_iterator iter = NotificationChannels.find(this);
+  if (iter != NotificationChannels.end()) {
+    const Channels *myChannels = iter->second;
+    const size_t channelno = notification->getChannelNo();
+    Notification_ptr mynotification = myChannels->getChannel(channelno);
+    ASSERT(mynotification != NULL,
+        "Relay::recieveNotification() - this relay does not have a notification no "+toString(channelno)+".");
+    mynotification->notifyAll(Updater);
+    Updater = NULL;
+  } else {
+    // note that this relay does not seem to have any channels
+  }
 }