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

[BIND 10 source code commits]

Author: jelte
Date: Fri Mar 12 14:29:40 2010
New Revision: 1365

Log:
a few small improvements

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:29:40 2010
@@ -56,6 +56,9 @@
 static bool
 listContains(ElementPtr list, ElementPtr el)
 {
+    if (!list) {
+        return false;
+    }
     BOOST_FOREACH(ElementPtr l_el, list->listValue()) {
         if (l_el == el) {
             return true;
@@ -116,8 +119,9 @@
     s1->add(Element::create(group));
     s1->add(Element::create(instance));
     s2->add(Element::create(group));
-    s2->add(Element::create(instance));
-    return (listContains(subscriptions, s1) || listContains(subscriptions, s2));
+    s2->add(Element::create("*"));
+    bool result = (listContains(subscriptions, s1) || listContains(subscriptions, s2));
+    return result;
 }
 
 bool
@@ -223,11 +227,14 @@
 }
 
 void
+Session::subscribe(std::string group, std::string instance) {
     //cout << "[XX] client subscribes to " << group << " . " << instance << endl;
-Session::subscribe(std::string group, std::string instance) {
     ElementPtr s_el = Element::createFromString("[]");
     s_el->add(Element::create(group));
     s_el->add(Element::create(instance));
+    if (!subscriptions) {
+        subscriptions = Element::createFromString("[]");
+    }
     subscriptions->add(s_el);
 }