diff options
| author | Gordon Sim <gsim@apache.org> | 2010-05-11 16:16:58 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2010-05-11 16:16:58 +0000 |
| commit | 397d2c2c7ce1e25980a60ab891e733728b60e32c (patch) | |
| tree | 909ef3943d50166b9269b3b1a5574936a8ebba47 /qpid/cpp/src | |
| parent | f3e8a605653ebb9ff310d0982e58721168a72fc5 (diff) | |
| download | qpid-python-397d2c2c7ce1e25980a60ab891e733728b60e32c.tar.gz | |
QPID-664: Fix failover updates to set correct option name; clear list valued option on setting it rather than merely appending to it.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@943160 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src')
| -rw-r--r-- | qpid/cpp/src/qpid/client/amqp0_10/ConnectionImpl.cpp | 1 | ||||
| -rw-r--r-- | qpid/cpp/src/qpid/client/amqp0_10/FailoverUpdates.cpp | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/qpid/cpp/src/qpid/client/amqp0_10/ConnectionImpl.cpp b/qpid/cpp/src/qpid/client/amqp0_10/ConnectionImpl.cpp index 6c3c9c5218..a1f285f5a9 100644 --- a/qpid/cpp/src/qpid/client/amqp0_10/ConnectionImpl.cpp +++ b/qpid/cpp/src/qpid/client/amqp0_10/ConnectionImpl.cpp @@ -65,6 +65,7 @@ bool setIfFound< std::vector<std::string> >(const Variant::Map& map, { Variant::Map::const_iterator i = map.find(key); if (i != map.end()) { + value.clear(); if (i->second.getType() == VAR_LIST) { convert(i->second.asList(), value); } else { diff --git a/qpid/cpp/src/qpid/client/amqp0_10/FailoverUpdates.cpp b/qpid/cpp/src/qpid/client/amqp0_10/FailoverUpdates.cpp index 354d6f6aba..2ae882cee9 100644 --- a/qpid/cpp/src/qpid/client/amqp0_10/FailoverUpdates.cpp +++ b/qpid/cpp/src/qpid/client/amqp0_10/FailoverUpdates.cpp @@ -56,7 +56,8 @@ struct FailoverUpdatesImpl : qpid::sys::Runnable try { Message message; while (!quit && receiver.fetch(message)) { - connection.setOption("urls", message.getProperties()["amq.failover"]); + connection.setOption("reconnect-urls", message.getProperties()["amq.failover"]); + QPID_LOG(debug, "Set reconnect-urls to " << message.getProperties()["amq.failover"]); session.acknowledge(); } } catch (const qpid::TransportFailure& e) { |