diff options
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/Ice/ObjectAdapterI.java | 3 | ||||
| -rw-r--r-- | java/src/IceInternal/EndpointI.java | 2 | ||||
| -rw-r--r-- | java/src/IceInternal/IncomingConnectionFactory.java | 5 | ||||
| -rw-r--r-- | java/src/IceInternal/PropertyNames.java | 6 | ||||
| -rw-r--r-- | java/src/IceInternal/TcpEndpointI.java | 2 | ||||
| -rw-r--r-- | java/src/IceInternal/UdpEndpointI.java | 2 | ||||
| -rw-r--r-- | java/src/IceInternal/UnknownEndpointI.java | 2 |
7 files changed, 14 insertions, 8 deletions
diff --git a/java/src/Ice/ObjectAdapterI.java b/java/src/Ice/ObjectAdapterI.java index 821b750403c..2b16d07acd3 100644 --- a/java/src/Ice/ObjectAdapterI.java +++ b/java/src/Ice/ObjectAdapterI.java @@ -804,7 +804,8 @@ public final class ObjectAdapterI extends LocalObjectImpl implements ObjectAdapt for(int i = 0; i < endpoints.size(); ++i) { IceInternal.EndpointI endp = (IceInternal.EndpointI)endpoints.get(i); - _incomingConnectionFactories.add(new IceInternal.IncomingConnectionFactory(instance, endp, this)); + _incomingConnectionFactories.add(new IceInternal.IncomingConnectionFactory( + instance, endp, this, _name)); } // diff --git a/java/src/IceInternal/EndpointI.java b/java/src/IceInternal/EndpointI.java index 434bcf75db6..f2b19862d11 100644 --- a/java/src/IceInternal/EndpointI.java +++ b/java/src/IceInternal/EndpointI.java @@ -114,7 +114,7 @@ abstract public class EndpointI implements Ice.Endpoint, java.lang.Comparable // from this endpoint, for example, if a dynamic port number is // assigned. // - public abstract Acceptor acceptor(EndpointIHolder endpoint); + public abstract Acceptor acceptor(EndpointIHolder endpoint, String adapterName); // // Expand endpoint out in to separate endpoints for each local diff --git a/java/src/IceInternal/IncomingConnectionFactory.java b/java/src/IceInternal/IncomingConnectionFactory.java index 86d67671eef..368dfb354ed 100644 --- a/java/src/IceInternal/IncomingConnectionFactory.java +++ b/java/src/IceInternal/IncomingConnectionFactory.java @@ -350,7 +350,8 @@ public final class IncomingConnectionFactory extends EventHandler } public - IncomingConnectionFactory(Instance instance, EndpointI endpoint, Ice.ObjectAdapter adapter) + IncomingConnectionFactory(Instance instance, EndpointI endpoint, Ice.ObjectAdapter adapter, + String adapterName) { super(instance); _endpoint = endpoint; @@ -407,7 +408,7 @@ public final class IncomingConnectionFactory extends EventHandler else { h.value = _endpoint; - _acceptor = _endpoint.acceptor(h); + _acceptor = _endpoint.acceptor(h, adapterName); _endpoint = h.value; assert(_acceptor != null); _acceptor.listen(); diff --git a/java/src/IceInternal/PropertyNames.java b/java/src/IceInternal/PropertyNames.java index 78e6dc38a49..490d65f42e4 100644 --- a/java/src/IceInternal/PropertyNames.java +++ b/java/src/IceInternal/PropertyNames.java @@ -7,7 +7,7 @@ // // ********************************************************************** -// Generated by makeprops.py from file `../config/PropertyNames.def', Wed May 24 12:10:31 2006 +// Generated by makeprops.py from file `/Users/matthew/cvs/ice/config/PropertyNames.def', Fri Jun 2 09:28:56 2006 // IMPORTANT: Do not edit this file -- any edits made here will be lost! @@ -242,6 +242,10 @@ public final class PropertyNames "^IceSSL\\.TruststoreType$", "^IceSSL\\.VerifyDepthMax$", "^IceSSL\\.VerifyPeer$", + "^IceSSL\\.TrustOnly$", + "^IceSSL\\.TrustOnly\\.Client$", + "^IceSSL\\.TrustOnly\\.Server$", + "^IceSSL\\.TrustOnly\\.Server\\.[^\\s.]+$", null }; diff --git a/java/src/IceInternal/TcpEndpointI.java b/java/src/IceInternal/TcpEndpointI.java index ccaf60b3c14..e188ebf8717 100644 --- a/java/src/IceInternal/TcpEndpointI.java +++ b/java/src/IceInternal/TcpEndpointI.java @@ -353,7 +353,7 @@ final class TcpEndpointI extends EndpointI // assigned. // public Acceptor - acceptor(EndpointIHolder endpoint) + acceptor(EndpointIHolder endpoint, String adapterName) { TcpAcceptor p = new TcpAcceptor(_instance, _host, _port); endpoint.value = new TcpEndpointI(_instance, _host, p.effectivePort(), _timeout, _connectionId, diff --git a/java/src/IceInternal/UdpEndpointI.java b/java/src/IceInternal/UdpEndpointI.java index e5842683ad5..13d0fab86b6 100644 --- a/java/src/IceInternal/UdpEndpointI.java +++ b/java/src/IceInternal/UdpEndpointI.java @@ -490,7 +490,7 @@ final class UdpEndpointI extends EndpointI // assigned. // public Acceptor - acceptor(EndpointIHolder endpoint) + acceptor(EndpointIHolder endpoint, String adapterName) { endpoint.value = this; return null; diff --git a/java/src/IceInternal/UnknownEndpointI.java b/java/src/IceInternal/UnknownEndpointI.java index 6af6a16316a..e1d19f8fc96 100644 --- a/java/src/IceInternal/UnknownEndpointI.java +++ b/java/src/IceInternal/UnknownEndpointI.java @@ -173,7 +173,7 @@ final class UnknownEndpointI extends EndpointI // assigned. // public Acceptor - acceptor(EndpointIHolder endpoint) + acceptor(EndpointIHolder endpoint, String adapterName) { endpoint.value = null; return null; |