summaryrefslogtreecommitdiff
path: root/java/src/Ice/ObjectAdapterI.java
diff options
context:
space:
mode:
authorBrent Eagles <brent@zeroc.com>2005-09-07 16:14:20 +0000
committerBrent Eagles <brent@zeroc.com>2005-09-07 16:14:20 +0000
commit4e631700d66c51a96210e2bcbd8b3f63d8b0b9f4 (patch)
tree5b0d75ebdea90cbdfb6c3955b601ece88ccbceee /java/src/Ice/ObjectAdapterI.java
parentBug 371: closeSocket can hide real errors (diff)
downloadice-4e631700d66c51a96210e2bcbd8b3f63d8b0b9f4.tar.bz2
ice-4e631700d66c51a96210e2bcbd8b3f63d8b0b9f4.tar.xz
ice-4e631700d66c51a96210e2bcbd8b3f63d8b0b9f4.zip
revising fixes for bug 431
Diffstat (limited to 'java/src/Ice/ObjectAdapterI.java')
-rw-r--r--java/src/Ice/ObjectAdapterI.java7
1 files changed, 3 insertions, 4 deletions
diff --git a/java/src/Ice/ObjectAdapterI.java b/java/src/Ice/ObjectAdapterI.java
index 227255d1def..79edfa2c418 100644
--- a/java/src/Ice/ObjectAdapterI.java
+++ b/java/src/Ice/ObjectAdapterI.java
@@ -692,7 +692,7 @@ public final class ObjectAdapterI extends LocalObjectImpl implements ObjectAdapt
// Only for use by IceInternal.ObjectAdapterFactory
//
public
- ObjectAdapterI(IceInternal.Instance instance, Communicator communicator, String name)
+ ObjectAdapterI(IceInternal.Instance instance, Communicator communicator, String name, String endpointInfo)
{
_deactivated = false;
_instance = instance;
@@ -711,8 +711,7 @@ public final class ObjectAdapterI extends LocalObjectImpl implements ObjectAdapt
// The connection factory might change it, for example, to
// fill in the real port number.
//
- String endpts = _instance.properties().getProperty(name + ".Endpoints");
- java.util.ArrayList endpoints = parseEndpoints(endpts);
+ java.util.ArrayList endpoints = parseEndpoints(endpointInfo);
for(int i = 0; i < endpoints.size(); ++i)
{
IceInternal.Endpoint endp = (IceInternal.Endpoint)endpoints.get(i);
@@ -723,7 +722,7 @@ public final class ObjectAdapterI extends LocalObjectImpl implements ObjectAdapt
// Parse published endpoints. These are used in proxies
// instead of the connection factory endpoints.
//
- endpts = _instance.properties().getProperty(name + ".PublishedEndpoints");
+ String endpts = _instance.properties().getProperty(name + ".PublishedEndpoints");
_publishedEndpoints = parseEndpoints(endpts);
String router = _instance.properties().getProperty(name + ".Router");