diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2007-07-24 09:17:35 -0400 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2007-07-24 09:17:35 -0400 |
| commit | e603bacb014c8d03b64a601aee354d8dff25cca0 (patch) | |
| tree | 11f1b528bb7d7973a2b1f8e2f9fec645169e8ed7 /cpp/src/Ice/PropertiesI.cpp | |
| parent | Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice (diff) | |
| parent | http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=2312 - changed 64 bit bin ... (diff) | |
| download | ice-e603bacb014c8d03b64a601aee354d8dff25cca0.tar.bz2 ice-e603bacb014c8d03b64a601aee354d8dff25cca0.tar.xz ice-e603bacb014c8d03b64a601aee354d8dff25cca0.zip | |
Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice
Diffstat (limited to 'cpp/src/Ice/PropertiesI.cpp')
| -rw-r--r-- | cpp/src/Ice/PropertiesI.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/cpp/src/Ice/PropertiesI.cpp b/cpp/src/Ice/PropertiesI.cpp index 09d38acc992..4bd8711b351 100644 --- a/cpp/src/Ice/PropertiesI.cpp +++ b/cpp/src/Ice/PropertiesI.cpp @@ -413,13 +413,16 @@ Ice::PropertiesI::parseLine(const string& line, const StringConverterPtr& conver if(converter) { string tmp; - converter->fromUTF8(reinterpret_cast<const Byte*>(key.data()), + converter->fromUTF8(reinterpret_cast<const Byte*>(key.data()), reinterpret_cast<const Byte*>(key.data() + key.size()), tmp); key.swap(tmp); - converter->fromUTF8(reinterpret_cast<const Byte*>(value.data()), - reinterpret_cast<const Byte*>(value.data() + value.size()), tmp); - value.swap(tmp); + if(!value.empty()) + { + converter->fromUTF8(reinterpret_cast<const Byte*>(value.data()), + reinterpret_cast<const Byte*>(value.data() + value.size()), tmp); + value.swap(tmp); + } } setProperty(key, value); |