diff options
| author | satorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-23 22:08:38 +0000 |
|---|---|---|
| committer | satorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-23 22:08:38 +0000 |
| commit | 0ad9ef8e4c41b13a5f889a485677f225d7e5a934 (patch) | |
| tree | c326fa4fd1f1c7473fbbd80205efd1c91e9a1ddc /dbus/object_proxy.h | |
| parent | cf426a373b10dbcf900772d0be23d0d33927cb6d (diff) | |
| download | chromium_src-0ad9ef8e4c41b13a5f889a485677f225d7e5a934.zip chromium_src-0ad9ef8e4c41b13a5f889a485677f225d7e5a934.tar.gz chromium_src-0ad9ef8e4c41b13a5f889a485677f225d7e5a934.tar.bz2 | |
dbus: Fix a bug where we were emitting spurious error messages.
Error messages like "Requested to remove an unknown match rule:
type='signal', interface='...'" were emitted at shutdown of Bus
object if an object proxy was connected to more than one signal of
the same interface.
TEST=changed the end_to_end_async_unittest to reproduce this bug, and confirm that the error messages were gone after fixing object_proxy.{cc,h}
BUG=chromium-os:23382
Review URL: http://codereview.chromium.org/8681002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111423 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'dbus/object_proxy.h')
| -rw-r--r-- | dbus/object_proxy.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dbus/object_proxy.h b/dbus/object_proxy.h index dcba44d..ef45305 100644 --- a/dbus/object_proxy.h +++ b/dbus/object_proxy.h @@ -9,8 +9,8 @@ #include <dbus/dbus.h> #include <map> +#include <set> #include <string> -#include <vector> #include "base/callback.h" #include "base/memory/ref_counted.h" @@ -192,7 +192,7 @@ class ObjectProxy : public base::RefCountedThreadSafe<ObjectProxy> { typedef std::map<std::string, SignalCallback> MethodTable; MethodTable method_table_; - std::vector<std::string> match_rules_; + std::set<std::string> match_rules_; DISALLOW_COPY_AND_ASSIGN(ObjectProxy); }; |