summaryrefslogtreecommitdiff
path: root/cpp/src/IceUtil
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2016-08-05 16:13:47 -0400
committerBernard Normier <bernard@zeroc.com>2016-08-05 16:13:47 -0400
commit71a86f0fcb59a8ea0f4a2e51675630ddaac27a8f (patch)
tree188156deff284e60491e816af1c2ba06195d0474 /cpp/src/IceUtil
parentFixed type ID for well-known locator registry object (diff)
downloadice-71a86f0fcb59a8ea0f4a2e51675630ddaac27a8f.tar.bz2
ice-71a86f0fcb59a8ea0f4a2e51675630ddaac27a8f.tar.xz
ice-71a86f0fcb59a8ea0f4a2e51675630ddaac27a8f.zip
Reduced string converter caching
Diffstat (limited to 'cpp/src/IceUtil')
-rw-r--r--cpp/src/IceUtil/StringConverter.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/cpp/src/IceUtil/StringConverter.cpp b/cpp/src/IceUtil/StringConverter.cpp
index dc029626c4f..2613efd6fe9 100644
--- a/cpp/src/IceUtil/StringConverter.cpp
+++ b/cpp/src/IceUtil/StringConverter.cpp
@@ -334,7 +334,14 @@ WstringConverterPtr
IceUtil::getProcessWstringConverter()
{
IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(processStringConverterMutex);
- return processWstringConverter;
+ if(processWstringConverter)
+ {
+ return processWstringConverter;
+ }
+ else
+ {
+ return getUnicodeWstringConverter();
+ }
}
void