Fixed bug 4514 - Ice/facets test failure

4 files changed, 24 insertions, 13 deletions

diff --git a/cpp/src/IceGrid/NodeI.cpp b/cpp/src/IceGrid/NodeI.cpp
index 90066875029..120df689b6a 100644
--- a/cpp/src/IceGrid/NodeI.cpp
+++ b/cpp/src/IceGrid/NodeI.cpp
@@ -363,18 +363,10 @@ NodeI::NodeI(const Ice::ObjectAdapterPtr& adapter,
     //
     // Parse the properties override property.
     //
-    string overrides = props->getProperty("IceGrid.Node.PropertiesOverride");
+    vector<string> overrides = props->getPropertyAsList("IceGrid.Node.PropertiesOverride");
     if(!overrides.empty())
     {
-        const string delim = " \t\r\n";
-        vector<string> overrideProps;
-        if(!IceUtilInternal::splitString(overrides, delim, overrideProps))
-        {
-            Ice::Warning out(_traceLevels->logger);
-            out << "invalid value for property `IceGrid.Node.PropertiesOverride':\nunmatched quote";
-        }
-
-        for(vector<string>::iterator p = overrideProps.begin(); p != overrideProps.end(); ++p)
+        for(vector<string>::iterator p = overrides.begin(); p != overrides.end(); ++p)
         {
             if(p->find("--") != 0)
             {
@@ -383,7 +375,7 @@ NodeI::NodeI(const Ice::ObjectAdapterPtr& adapter,
         }
 
         Ice::PropertiesPtr p = Ice::createProperties();
-        p->parseCommandLineOptions("", overrideProps);
+        p->parseCommandLineOptions("", overrides);
         Ice::PropertyDict propDict = p->getPropertiesForPrefix("");
         for(Ice::PropertyDict::const_iterator q = propDict.begin(); q != propDict.end(); ++q)
         {
diff --git a/cpp/src/IceUtil/StringUtil.cpp b/cpp/src/IceUtil/StringUtil.cpp
index edec3076976..dbbcfa0da9f 100644
--- a/cpp/src/IceUtil/StringUtil.cpp
+++ b/cpp/src/IceUtil/StringUtil.cpp
@@ -329,6 +329,11 @@ IceUtilInternal::splitString(const string& str, const string& delim, vector<stri
             quoteChar = str[pos++];
             continue; // Skip the quote
         }
+        else if(quoteChar == '\0' && str[pos] == '\\' && pos + 1 < length && 
+                (str[pos + 1] == '\'' || str[pos + 1] == '"'))
+        {
+            ++pos;
+        }
         else if(quoteChar != '\0' && str[pos] == '\\' && pos + 1 < length && str[pos + 1] == quoteChar)
         {
             ++pos;
diff --git a/cpp/test/Ice/facets/AllTests.cpp b/cpp/test/Ice/facets/AllTests.cpp
index 747889ea21b..5d39586360b 100644
--- a/cpp/test/Ice/facets/AllTests.cpp
+++ b/cpp/test/Ice/facets/AllTests.cpp
@@ -27,12 +27,13 @@ allTests(const Ice::CommunicatorPtr& communicator)
     communicator->getProperties()->setProperty("Ice.Admin.Facets", "foobar");
     Ice::StringSeq facetFilter = communicator->getProperties()->getPropertyAsList("Ice.Admin.Facets");
     test(facetFilter.size() == 1 && facetFilter[0] == "foobar");
-    communicator->getProperties()->setProperty("Ice.Admin.Facets", "foo'bar");
+    communicator->getProperties()->setProperty("Ice.Admin.Facets", "foo\\'bar");
     facetFilter = communicator->getProperties()->getPropertyAsList("Ice.Admin.Facets");
     test(facetFilter.size() == 1 && facetFilter[0] == "foo'bar");
     communicator->getProperties()->setProperty("Ice.Admin.Facets", "'foo bar' toto 'titi'");
     facetFilter = communicator->getProperties()->getPropertyAsList("Ice.Admin.Facets");
-    test(facetFilter.size() == 3 && facetFilter[0] == "foo bar" && facetFilter[1] == "toto" && facetFilter[2] == "titi");
+    test(facetFilter.size() == 3 && facetFilter[0] == "foo bar" && facetFilter[1] == "toto" && 
+         facetFilter[2] == "titi");
     communicator->getProperties()->setProperty("Ice.Admin.Facets", "'foo bar\\' toto' 'titi'");
     facetFilter = communicator->getProperties()->getPropertyAsList("Ice.Admin.Facets");
     test(facetFilter.size() == 2 && facetFilter[0] == "foo bar' toto" && facetFilter[1] == "titi");
diff --git a/cpp/test/IceUtil/inputUtil/Client.cpp b/cpp/test/IceUtil/inputUtil/Client.cpp
index 8341b43ecea..4a710f7f56d 100644
--- a/cpp/test/IceUtil/inputUtil/Client.cpp
+++ b/cpp/test/IceUtil/inputUtil/Client.cpp
@@ -231,6 +231,19 @@ main(int, char**)
         test(IceUtilInternal::splitString("\"'a\"", ":", ss) && ss.size() == 1 && ss[0] == "'a");
         ss.clear();
 
+        test(IceUtilInternal::splitString("a\\'b", ":", ss) && ss.size() == 1 && ss[0] == "a'b");
+        ss.clear();
+        test(IceUtilInternal::splitString("'a:b\\'c'", ":", ss) && ss.size() == 1 && ss[0] == "a:b'c");
+        ss.clear();
+        test(IceUtilInternal::splitString("a\\\"b", ":", ss) && ss.size() == 1 && ss[0] == "a\"b");
+        ss.clear();
+        test(IceUtilInternal::splitString("\"a:b\\\"c\"", ":", ss) && ss.size() == 1 && ss[0] == "a:b\"c");
+        ss.clear();
+        test(IceUtilInternal::splitString("'a:b\"c'", ":", ss) && ss.size() == 1 && ss[0] == "a:b\"c");
+        ss.clear();
+        test(IceUtilInternal::splitString("\"a:b'c\"", ":", ss) && ss.size() == 1 && ss[0] == "a:b'c");
+        ss.clear();
+
         test(!IceUtilInternal::splitString("a\"b", ":", ss));
     }
     cout << "ok" << endl;