summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
authorGordon Sim <gsim@apache.org>2010-04-01 18:41:37 +0000
committerGordon Sim <gsim@apache.org>2010-04-01 18:41:37 +0000
commit0f150114eceda34771972fa4fb194b6eef6b1afa (patch)
treed974d1130c77ea8db761bbc2da7d359946b61297 /cpp
parent66491cc2d4b35cc62b1cf038ce6cd67554f46024 (diff)
downloadqpid-python-0f150114eceda34771972fa4fb194b6eef6b1afa.tar.gz
QPID-664: minor adjustment to connection option names
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@930061 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp')
-rw-r--r--cpp/include/qpid/messaging/Connection.h2
-rw-r--r--cpp/src/qpid/client/amqp0_10/ConnectionImpl.cpp6
2 files changed, 4 insertions, 4 deletions
diff --git a/cpp/include/qpid/messaging/Connection.h b/cpp/include/qpid/messaging/Connection.h
index 8b0f9e98e3..34a37ab776 100644
--- a/cpp/include/qpid/messaging/Connection.h
+++ b/cpp/include/qpid/messaging/Connection.h
@@ -54,7 +54,6 @@ class Connection : public qpid::messaging::Handle<ConnectionImpl>
* sasl-min-ssf
* sasl-max-ssf
* protocol
- * urls
*
* (note also bounds, locale, max-channels and max-framesize, but
* not sure whether those should be documented here)
@@ -67,6 +66,7 @@ class Connection : public qpid::messaging::Handle<ConnectionImpl>
* reconnect-interval-min: number of seconds (initial delay between failed reconnection attempts)
* reconnect-interval-max: number of seconds (maximum delay between failed reconnection attempts)
* reconnect-interval: shorthand for setting the same reconnect_interval_min/max
+ * reconnect-urls: list of alternate urls to try when connecting
*
* The reconnect-interval is the time that the client waits
* for after a failed attempt to reconnect before retrying. It
diff --git a/cpp/src/qpid/client/amqp0_10/ConnectionImpl.cpp b/cpp/src/qpid/client/amqp0_10/ConnectionImpl.cpp
index ee044aaf2b..5828449d5e 100644
--- a/cpp/src/qpid/client/amqp0_10/ConnectionImpl.cpp
+++ b/cpp/src/qpid/client/amqp0_10/ConnectionImpl.cpp
@@ -113,10 +113,10 @@ void ConnectionImpl::setOptions(const Variant::Map& options)
if (setIfFound(options, "reconnect-interval", reconnectInterval)) {
minReconnectInterval = maxReconnectInterval = reconnectInterval;
} else {
- setIfFound(options, "min-reconnect-interval", minReconnectInterval);
- setIfFound(options, "max-reconnect-interval", maxReconnectInterval);
+ setIfFound(options, "reconnect-interval-min", minReconnectInterval);
+ setIfFound(options, "reconnect-interval-max", maxReconnectInterval);
}
- setIfFound(options, "urls", urls);
+ setIfFound(options, "reconnect-urls", urls);
}
void ConnectionImpl::setOption(const std::string& name, const Variant& value)