summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/PropertiesI.cpp
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2014-05-13 16:52:57 -0400
committerBernard Normier <bernard@zeroc.com>2014-05-13 16:52:57 -0400
commit3c9f5dc69d65b3f290a0de8c23184847fef41198 (patch)
treed884ccddefc9cd2f1057c63a60a0e0dc36e5931b /cpp/src/Ice/PropertiesI.cpp
parentRemoved more unnecessary virtual inheritance from demos (diff)
downloadice-3c9f5dc69d65b3f290a0de8c23184847fef41198.tar.bz2
ice-3c9f5dc69d65b3f290a0de8c23184847fef41198.tar.xz
ice-3c9f5dc69d65b3f290a0de8c23184847fef41198.zip
Fixed ICE-5539 (C++ only) and added properties test for whitespace and escapes.
Diffstat (limited to 'cpp/src/Ice/PropertiesI.cpp')
-rw-r--r--cpp/src/Ice/PropertiesI.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/cpp/src/Ice/PropertiesI.cpp b/cpp/src/Ice/PropertiesI.cpp
index 05c98890614..b8642c3af78 100644
--- a/cpp/src/Ice/PropertiesI.cpp
+++ b/cpp/src/Ice/PropertiesI.cpp
@@ -657,7 +657,7 @@ Ice::PropertiesI::parseLine(const string& line, const IceUtil::StringConverterPt
else
{
value += value.length() == 0 ? escapedspace : whitespace;
- value += c;
+ value += c;
}
break;
@@ -672,7 +672,6 @@ Ice::PropertiesI::parseLine(const string& line, const IceUtil::StringConverterPt
break;
case '#':
- value += escapedspace;
finished = true;
break;