Reject empty endpoint in OA endpoint list

1 files changed, 6 insertions, 5 deletions

diff --git a/csharp/src/Ice/ObjectAdapterI.cs b/csharp/src/Ice/ObjectAdapterI.cs
index 26523708c67..5929b46fd3c 100644
--- a/csharp/src/Ice/ObjectAdapterI.cs
+++ b/csharp/src/Ice/ObjectAdapterI.cs
@@ -1118,6 +1118,10 @@ namespace Ice
                 beg = IceUtilInternal.StringUtil.findFirstNotOf(endpts, delim, end);
                 if(beg == -1)
                 {
+                    if(endpoints.Count != 0)
+                    {
+                        throw new EndpointParseException("invalid empty object adapter endpoint");
+                    }
                     break;
                 }
 
@@ -1166,17 +1170,14 @@ namespace Ice
 
                 if(end == beg)
                 {
-                    ++end;
-                    continue;
+                    throw new EndpointParseException("invalid empty object adapter endpoint");
                 }
 
                 string s = endpts.Substring(beg, (end) - (beg));
                 EndpointI endp = _instance.endpointFactoryManager().create(s, oaEndpoints);
                 if(endp == null)
                 {
-                    EndpointParseException e2 = new EndpointParseException();
-                    e2.str = "invalid object adapter endpoint `" + s + "'";
-                    throw e2;
+                    throw new EndpointParseException("invalid object adapter endpoint `" + s + "'");
                 }
                 endpoints.Add(endp);