[svn] commit: r1366 - /trunk/src/lib/config/tests/fake_session.cc

[BIND 10 source code commits]

Author: jelte
Date: Fri Mar 12 14:37:55 2010
New Revision: 1366

Log:
null checks for all global fake session variables

Modified:
    trunk/src/lib/config/tests/fake_session.cc

Modified: trunk/src/lib/config/tests/fake_session.cc
==============================================================================
--- trunk/src/lib/config/tests/fake_session.cc (original)
+++ trunk/src/lib/config/tests/fake_session.cc Fri Mar 12 14:37:55 2010
@@ -114,6 +114,9 @@
 bool
 haveSubscription(const std::string& group, const std::string& instance)
 {
+    if (!subscriptions) {
+        return false;
+    }
     ElementPtr s1 = Element::createFromString("[]");
     ElementPtr s2 = Element::createFromString("[]");
     s1->add(Element::create(group));
@@ -205,7 +208,7 @@
         msg = initial_messages->get(0);
         initial_messages->remove(0);
         return true;
-    } else {
+    } else if (msg_queue) {
         BOOST_FOREACH(ElementPtr c_m, msg_queue->listValue()) {
             ElementPtr to_remove = ElementPtr();
             if (haveSubscription(c_m->get(0), c_m->get(1))) {
@@ -244,6 +247,9 @@
     ElementPtr s_el = Element::createFromString("[]");
     s_el->add(Element::create(group));
     s_el->add(Element::create(instance));
+    if (!subscriptions) {
+        return;
+    }
     listRemove(subscriptions, s_el);
 }