You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by gs...@apache.org on 2013/09/20 20:35:08 UTC
svn commit: r1525091 - in /qpid/trunk/qpid:
cpp/src/qpid/broker/amqp/NodeProperties.cpp
cpp/src/qpid/broker/amqp/NodeProperties.h
cpp/src/qpid/broker/amqp/Session.cpp tools/src/py/qpid-config
Author: gsim
Date: Fri Sep 20 18:35:07 2013
New Revision: 1525091
URL: http://svn.apache.org/r1525091
Log:
QPID-5152: handling of exchange properties for create-on-demand with 1.0
Modified:
qpid/trunk/qpid/cpp/src/qpid/broker/amqp/NodeProperties.cpp
qpid/trunk/qpid/cpp/src/qpid/broker/amqp/NodeProperties.h
qpid/trunk/qpid/cpp/src/qpid/broker/amqp/Session.cpp
qpid/trunk/qpid/tools/src/py/qpid-config
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/amqp/NodeProperties.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/amqp/NodeProperties.cpp?rev=1525091&r1=1525090&r2=1525091&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/amqp/NodeProperties.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/amqp/NodeProperties.cpp Fri Sep 20 18:35:07 2013
@@ -277,4 +277,9 @@ bool NodeProperties::trackControllingLin
return lifetime == QueueSettings::DELETE_ON_CLOSE || lifetime == QueueSettings::DELETE_IF_EMPTY;
}
+const qpid::types::Variant::Map& NodeProperties::getProperties() const
+{
+ return properties;
+}
+
}}} // namespace qpid::broker::amqp
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/amqp/NodeProperties.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/amqp/NodeProperties.h?rev=1525091&r1=1525090&r2=1525091&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/amqp/NodeProperties.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/amqp/NodeProperties.h Fri Sep 20 18:35:07 2013
@@ -61,6 +61,7 @@ class NodeProperties : public qpid::amqp
std::string getExchangeType() const;
std::string getAlternateExchange() const;
bool trackControllingLink() const;
+ const qpid::types::Variant::Map& getProperties() const;
private:
bool queue;
bool durable;
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/amqp/Session.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/amqp/Session.cpp?rev=1525091&r1=1525090&r2=1525091&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/amqp/Session.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/amqp/Session.cpp Fri Sep 20 18:35:07 2013
@@ -44,6 +44,7 @@
#include "qpid/framing/FieldTable.h"
#include "qpid/framing/MessageTransferBody.h"
#include "qpid/log/Statement.h"
+#include "qpid/amqp_0_10/Codecs.h"
#include <boost/intrusive_ptr.hpp>
#include <boost/format.hpp>
#include <map>
@@ -215,6 +216,7 @@ Session::ResolvedNode Session::resolve(c
node.queue = connection.getBroker().createQueue(name, node.properties.getQueueSettings(), this, node.properties.getAlternateExchange(), connection.getUserId(), connection.getId()).first;
} else {
qpid::framing::FieldTable args;
+ qpid::amqp_0_10::translate(node.properties.getProperties(), args);
node.exchange = connection.getBroker().createExchange(name, node.properties.getExchangeType(), node.properties.isDurable(), node.properties.getAlternateExchange(),
args, connection.getUserId(), connection.getId()).first;
}
Modified: qpid/trunk/qpid/tools/src/py/qpid-config
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/tools/src/py/qpid-config?rev=1525091&r1=1525090&r2=1525091&view=diff
==============================================================================
--- qpid/trunk/qpid/tools/src/py/qpid-config (original)
+++ qpid/trunk/qpid/tools/src/py/qpid-config Fri Sep 20 18:35:07 2013
@@ -441,8 +441,8 @@ class BrokerManager:
if not args: args = {}
if ex.durable: print "--durable",
if REPLICATE in args: print "--replicate=%s" % args[REPLICATE],
- if MSG_SEQUENCE in args and args[MSG_SEQUENCE] == 1: print "--sequence",
- if IVE in args and args[IVE] == 1: print "--ive",
+ if MSG_SEQUENCE in args and args[MSG_SEQUENCE]: print "--sequence",
+ if IVE in args and args[IVE]: print "--ive",
if ex.altExchange:
print "--alternate-exchange=%s" % ex.altExchange,
print
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org