diff options
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/Ice/src/main/java/com/zeroc/Ice/ObjectAdapterI.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/java/src/Ice/src/main/java/com/zeroc/Ice/ObjectAdapterI.java b/java/src/Ice/src/main/java/com/zeroc/Ice/ObjectAdapterI.java index 1bbe0aa90e6..de83357a228 100644 --- a/java/src/Ice/src/main/java/com/zeroc/Ice/ObjectAdapterI.java +++ b/java/src/Ice/src/main/java/com/zeroc/Ice/ObjectAdapterI.java @@ -1210,6 +1210,10 @@ public final class ObjectAdapterI implements ObjectAdapter beg = com.zeroc.IceUtilInternal.StringUtil.findFirstNotOf(endpts, delim, end); if(beg == -1) { + if(!endpoints.isEmpty()) + { + throw new EndpointParseException("invalid empty object adapter endpoint"); + } break; } @@ -1258,17 +1262,14 @@ public final class ObjectAdapterI implements ObjectAdapter if(end == beg) { - ++end; - continue; + throw new EndpointParseException("invalid empty object adapter endpoint"); } String s = endpts.substring(beg, end); com.zeroc.IceInternal.EndpointI endp = _instance.endpointFactoryManager().create(s, oaEndpoints); if(endp == null) { - EndpointParseException e = new EndpointParseException(); - e.str = "invalid object adapter endpoint `" + s + "'"; - throw e; + throw new EndpointParseException("invalid object adapter endpoint `" + s + "'"); } endpoints.add(endp); |