summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/PropertiesI.cpp
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2014-06-17 11:51:33 -0400
committerBernard Normier <bernard@zeroc.com>2014-06-17 11:51:33 -0400
commited0e036511b359ffbf54ad6357c29350dda708a2 (patch)
treee15a8a2fa3712c718f6d767747f835a22b969321 /cpp/src/Ice/PropertiesI.cpp
parentremoving C# debuggin, adding .exe.config files for cs/test/Ice/acm (diff)
downloadice-ed0e036511b359ffbf54ad6357c29350dda708a2.tar.bz2
ice-ed0e036511b359ffbf54ad6357c29350dda708a2.tar.xz
ice-ed0e036511b359ffbf54ad6357c29350dda708a2.zip
Fix for ICE-5321: Ice.Config set to empty value (C++, Java, C#)
Diffstat (limited to 'cpp/src/Ice/PropertiesI.cpp')
-rw-r--r--cpp/src/Ice/PropertiesI.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/Ice/PropertiesI.cpp b/cpp/src/Ice/PropertiesI.cpp
index 121e6ed8889..5c50218d246 100644
--- a/cpp/src/Ice/PropertiesI.cpp
+++ b/cpp/src/Ice/PropertiesI.cpp
@@ -752,8 +752,8 @@ Ice::PropertiesI::loadConfig()
{
load(IceUtilInternal::trim(*i));
}
- }
- PropertyValue pv(value, true);
- _properties["Ice.Config"] = pv;
+ PropertyValue pv(value, true);
+ _properties["Ice.Config"] = pv;
+ }
}