summaryrefslogtreecommitdiff
path: root/cpp/src/qpid/messaging/AddressParser.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/qpid/messaging/AddressParser.cpp')
-rw-r--r--cpp/src/qpid/messaging/AddressParser.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/cpp/src/qpid/messaging/AddressParser.cpp b/cpp/src/qpid/messaging/AddressParser.cpp
index d76210ee5d..4c8f35fbc5 100644
--- a/cpp/src/qpid/messaging/AddressParser.cpp
+++ b/cpp/src/qpid/messaging/AddressParser.cpp
@@ -151,7 +151,7 @@ bool AddressParser::readValueIfExists(Variant& value)
bool AddressParser::readString(std::string& value, char delimiter)
{
if (readChar(delimiter)) {
- std::string::size_type start = current;
+ std::string::size_type start = current++;
while (!eos()) {
if (input.at(current) == delimiter) {
if (current > start) {
@@ -201,8 +201,7 @@ bool AddressParser::readSimpleValue(Variant& value)
{
std::string s;
if (readWord(s)) {
- value.parse(s);
- if (value.getType() == VAR_STRING) value.setEncoding("utf8");
+ value.parse(s);
return true;
} else {
return false;