Bug 3529 - check ice version before esacping properties

1 files changed, 14 insertions, 1 deletions

diff --git a/cpp/src/IceGrid/ServerI.cpp b/cpp/src/IceGrid/ServerI.cpp
index 81a85c97157..1ebd9e84ba3 100644
--- a/cpp/src/IceGrid/ServerI.cpp
+++ b/cpp/src/IceGrid/ServerI.cpp
@@ -2127,6 +2127,12 @@ ServerI::updateImpl(const InternalServerDescriptorPtr& descriptor)
     // Create the configuration files, remove the old ones.
     //
     {
+        //
+        // We do not want to esapce the properties if the Ice version is 
+        // previous to Ice 3.3.
+        //
+        bool escapeProperties = (_desc->iceVersion == 0 || _desc->iceVersion > 30300);
+
         Ice::StringSeq knownFiles;
         for(PropertyDescriptorSeqDict::const_iterator p = properties.begin(); p != properties.end(); ++p)
         {
@@ -2147,7 +2153,14 @@ ServerI::updateImpl(const InternalServerDescriptorPtr& descriptor)
                 }
                 else
                 {
-                    configfile << escapeProperty(r->name) << "=" << escapeProperty(r->value) << endl;
+                    if(escapeProperties)
+                    {
+                        configfile << escapeProperty(r->name) << "=" << escapeProperty(r->value) << endl;
+                    }
+                    else
+                    {
+                        configfile << r->name << "=" << r->value << endl;
+                    }
                 }
             }
             configfile.close();