- Merge IPv6 support from Dwayne's branch.

- Reviewed and fixed IPv6 bugs.
- Fixed bug in the outgoing connection factory where an assert could be
  triggered if the proxy contained identical endpoints

1 files changed, 40 insertions, 3 deletions

diff --git a/java/src/IceInternal/ReferenceFactory.java b/java/src/IceInternal/ReferenceFactory.java
index 37f24e64c56..d8a7bd2e5ec 100644
--- a/java/src/IceInternal/ReferenceFactory.java
+++ b/java/src/IceInternal/ReferenceFactory.java
@@ -418,10 +418,47 @@ public final class ReferenceFactory
             {
                 beg = end + 1;
                 
-                end = s.indexOf(':', beg);
-                if(end == -1)
+                end = beg;
+                while(true)
                 {
-                    end = s.length();
+                    end = s.indexOf(':', end);
+                    if(end == -1)
+                    {
+                        end = s.length();
+                        break;
+                    }
+                    else
+                    {
+                        boolean quoted = false;
+                        int quote = beg;
+                        while(true)
+                        {
+                            quote = s.indexOf('\"', quote);
+                            if(quote == -1 || end < quote)
+                            {
+                                break;
+                            }
+                            else
+                            {
+                                quote = s.indexOf('\"', ++quote);
+                                if(quote == -1)
+                                {
+                                    break;
+                                }
+                                else if(end < quote)
+                                {
+                                    quoted = true;
+                                    break;
+                                }
+                                ++quote;
+                            }
+                        }
+                        if(!quoted)
+                        {
+                            break;
+                        }
+                        ++end;
+                    }
                 }
                 
                 String es = s.substring(beg, end);