Merge branch 'R3_3_branch' of cvs:/home/git/ice into R3_3_branch

Conflicts:

	java/resources/IceGridAdmin/icegridadmin_content_dyn.html
	java/resources/IceGridAdmin/icegridadmin_content_static.html

1 files changed, 11 insertions, 2 deletions

diff --git a/cpp/src/IceGrid/Util.cpp b/cpp/src/IceGrid/Util.cpp
index d3b6b998738..cf6d248c1a4 100644
--- a/cpp/src/IceGrid/Util.cpp
+++ b/cpp/src/IceGrid/Util.cpp
@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2009 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -100,14 +100,23 @@ IceGrid::createProperty(const string& name, const string& value)
 string
 IceGrid::escapeProperty(const string& s)
 {
+    size_t firstChar = s.find_first_not_of(' ');
+    size_t lastChar = s.find_last_not_of(' ');
     string result;
     for(unsigned int i = 0; i < s.size(); ++i)
     {
         char c = s[i];
         switch(c)
         {
-          case '\\':
           case ' ':
+            if(i < firstChar || i > lastChar)
+            {
+                result.push_back('\\');
+            }
+            result.push_back(c);
+            break;
+
+          case '\\':
           case '#':
           case '=':
             result.push_back('\\');