http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=2118

1 files changed, 13 insertions, 1 deletions

diff --git a/java/src/IceInternal/ReferenceFactory.java b/java/src/IceInternal/ReferenceFactory.java
index dfb8c4b4d12..8cd07cfa7c7 100644
--- a/java/src/IceInternal/ReferenceFactory.java
+++ b/java/src/IceInternal/ReferenceFactory.java
@@ -471,6 +471,7 @@ public final class ReferenceFactory
                 throw e;
             }
 
+            String adapterstr = null;
             end = IceUtil.StringUtil.checkQuote(s, beg);
             if(end == -1)
             {
@@ -485,14 +486,25 @@ public final class ReferenceFactory
                 {
                     end = s.length();
                 }
+                adapterstr = s.substring(beg, end);
             }
             else
             {
                 beg++; // Skip leading quote
+                adapterstr = s.substring(beg, end);
+                end++; // Skip trailing quote
             }
 
+            if(end != s.length() && IceUtil.StringUtil.findFirstNotOf(s, delim, end) != -1)
+            {
+                Ice.ProxyParseException e = new Ice.ProxyParseException();
+                e.str = s;
+                throw e;
+            }
+            
             Ice.StringHolder token = new Ice.StringHolder();
-            if(!IceUtil.StringUtil.unescapeString(s, beg, end, token) || token.value.length() == 0)
+            if(!IceUtil.StringUtil.unescapeString(adapterstr, 0, adapterstr.length(), token) ||
+               token.value.length() == 0)
             {
                 Ice.ProxyParseException e = new Ice.ProxyParseException();
                 e.str = s;