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/12/03 18:52:50 UTC
svn commit: r1547495 -
/qpid/trunk/qpid/cpp/src/qpid/broker/amqp/NodeProperties.cpp
Author: gsim
Date: Tue Dec 3 17:52:49 2013
New Revision: 1547495
URL: http://svn.apache.org/r1547495
Log:
QPID-5383: retain encoding information in queue properties
Modified:
qpid/trunk/qpid/cpp/src/qpid/broker/amqp/NodeProperties.cpp
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=1547495&r1=1547494&r2=1547495&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/amqp/NodeProperties.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/amqp/NodeProperties.cpp Tue Dec 3 17:52:49 2013
@@ -27,6 +27,7 @@
#include "qpid/amqp/Descriptor.h"
#include "qpid/amqp/descriptors.h"
#include "qpid/amqp_0_10/Codecs.h"
+#include "qpid/types/encodings.h"
#include "qpid/types/Variant.h"
#include "qpid/broker/QueueSettings.h"
#include "qpid/log/Statement.h"
@@ -305,14 +306,23 @@ void NodeProperties::onTimestampValue(co
process(key.str(), value, d);
}
+namespace {
+qpid::types::Variant utf8(const std::string& s)
+{
+ qpid::types::Variant v(s);
+ v.setEncoding(qpid::types::encodings::UTF8);
+ return v;
+}
+}
+
void NodeProperties::onStringValue(const CharSequence& key, const CharSequence& value, const Descriptor* d)
{
- process(key.str(), value.str(), d);
+ process(key.str(), utf8(value.str()), d);
}
void NodeProperties::onSymbolValue(const CharSequence& key, const CharSequence& value, const Descriptor* d)
{
- process(key.str(), value.str(), d);
+ process(key.str(), utf8(value.str()), d);
}
QueueSettings NodeProperties::getQueueSettings()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org