diff options
| author | Kim van der Riet <kpvdr@apache.org> | 2009-02-03 20:37:30 +0000 |
|---|---|---|
| committer | Kim van der Riet <kpvdr@apache.org> | 2009-02-03 20:37:30 +0000 |
| commit | 4d7398f3ec2879bb2921f4b464d7b3e9c2503886 (patch) | |
| tree | f7c90685c80c8aa834cebd18d8ae876c69d619c1 /cpp | |
| parent | 4c741e8df067c8f2fc2df8b2e30e3383d54fa2cf (diff) | |
| download | qpid-python-4d7398f3ec2879bb2921f4b464d7b3e9c2503886.tar.gz | |
Changed name of UpdateClient's queue from "\000qpid-update" to "qpid.qpid-update" to avoid problems with c-strings in BDB
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@740429 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/configure.ac | 4 | ||||
| -rw-r--r-- | cpp/src/qpid/cluster/UpdateClient.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cpp/configure.ac b/cpp/configure.ac index 4fe143bedf..009ff9d4f0 100644 --- a/cpp/configure.ac +++ b/cpp/configure.ac @@ -172,8 +172,8 @@ AC_ARG_WITH([cpg], [AS_HELP_STRING([--with-cpg], [Build with CPG support for clustering.])], [case "${withval}" in yes) # yes - require dependencies - test x$have_libcpg = xyes || AC_MSG_ERROR([libcpg not found, install openais-devel or corosync-devel]) - test x$have_cpg_h = xyes || AC_MSG_ERROR([cpg.h not found, install openais-devel or corosync-devel]) + test x$have_libcpg = xyes || AC_MSG_ERROR([libcpg not found, install openais-devel and corosync-devel]) + test x$have_cpg_h = xyes || AC_MSG_ERROR([cpg.h not found, install openais-devel and corosync-devel]) with_cpg=yes ;; no) with_cpg=no ;; diff --git a/cpp/src/qpid/cluster/UpdateClient.cpp b/cpp/src/qpid/cluster/UpdateClient.cpp index 2ed0b26a0d..08f09573a4 100644 --- a/cpp/src/qpid/cluster/UpdateClient.cpp +++ b/cpp/src/qpid/cluster/UpdateClient.cpp @@ -99,8 +99,8 @@ UpdateClient::UpdateClient(const MemberId& updater, const MemberId& updatee, con UpdateClient::~UpdateClient() {} -// Illegal exchange/queue name for catch-up, avoid clashes with user queues/exchanges. -static const char UPDATE_CHARS[] = "\000qpid-update"; +// Reserved exchange/queue name for catch-up, avoid clashes with user queues/exchanges. +static const char UPDATE_CHARS[] = "qpid.qpid-update"; const std::string UpdateClient::UPDATE(UPDATE_CHARS, sizeof(UPDATE_CHARS)); void UpdateClient::update() { |