diff options
Diffstat (limited to 'java/src')
15 files changed, 49 insertions, 18 deletions
diff --git a/java/src/Ice/src/main/java/Ice/ConnectionI.java b/java/src/Ice/src/main/java/Ice/ConnectionI.java index f74d7b81832..d33ae1d3c20 100644 --- a/java/src/Ice/src/main/java/Ice/ConnectionI.java +++ b/java/src/Ice/src/main/java/Ice/ConnectionI.java @@ -1420,7 +1420,7 @@ public final class ConnectionI extends IceInternal.EventHandler } @Override - public void setReadyCallback(IceInternal.EventHandler.ReadyCallback callback) + public void setReadyCallback(IceInternal.ReadyCallback callback) { _transceiver.setReadyCallback(callback); } diff --git a/java/src/Ice/src/main/java/IceInternal/Acceptor.java b/java/src/Ice/src/main/java/IceInternal/Acceptor.java index 1b332a732f7..214292cf28f 100644 --- a/java/src/Ice/src/main/java/IceInternal/Acceptor.java +++ b/java/src/Ice/src/main/java/IceInternal/Acceptor.java @@ -12,6 +12,7 @@ package IceInternal; public interface Acceptor { java.nio.channels.ServerSocketChannel fd(); + void setReadyCallback(ReadyCallback callback); void close(); EndpointI listen(); Transceiver accept(); diff --git a/java/src/Ice/src/main/java/IceInternal/EventHandler.java b/java/src/Ice/src/main/java/IceInternal/EventHandler.java index 5964361f413..cc369842e1a 100644 --- a/java/src/Ice/src/main/java/IceInternal/EventHandler.java +++ b/java/src/Ice/src/main/java/IceInternal/EventHandler.java @@ -11,12 +11,6 @@ package IceInternal; public abstract class EventHandler { - public interface ReadyCallback - { - void ready(int op, boolean value); - }; - - // // Called when there's a message ready to be processed. // diff --git a/java/src/Ice/src/main/java/IceInternal/IncomingConnectionFactory.java b/java/src/Ice/src/main/java/IceInternal/IncomingConnectionFactory.java index 34c31c536ee..2b7b2453a6e 100644 --- a/java/src/Ice/src/main/java/IceInternal/IncomingConnectionFactory.java +++ b/java/src/Ice/src/main/java/IceInternal/IncomingConnectionFactory.java @@ -329,9 +329,12 @@ public final class IncomingConnectionFactory extends EventHandler implements Ice } @Override - public void setReadyCallback(EventHandler.ReadyCallback readyCallback) + public void setReadyCallback(ReadyCallback readyCallback) { - // Ignore, we have no use of the ready callback in the incoming connection factory. + if(_acceptor != null) + { + _acceptor.setReadyCallback(readyCallback); + } } // diff --git a/java/src/Ice/src/main/java/IceInternal/ReadyCallback.java b/java/src/Ice/src/main/java/IceInternal/ReadyCallback.java new file mode 100644 index 00000000000..4020199cabc --- /dev/null +++ b/java/src/Ice/src/main/java/IceInternal/ReadyCallback.java @@ -0,0 +1,15 @@ +// ********************************************************************** +// +// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +// +// This copy of Ice is licensed to you under the terms described in the +// ICE_LICENSE file included in this distribution. +// +// ********************************************************************** + +package IceInternal; + +public interface ReadyCallback +{ + void ready(int op, boolean value); +}; diff --git a/java/src/Ice/src/main/java/IceInternal/TcpAcceptor.java b/java/src/Ice/src/main/java/IceInternal/TcpAcceptor.java index 493a7b42184..153c5ed9d83 100644 --- a/java/src/Ice/src/main/java/IceInternal/TcpAcceptor.java +++ b/java/src/Ice/src/main/java/IceInternal/TcpAcceptor.java @@ -18,6 +18,12 @@ class TcpAcceptor implements Acceptor } @Override + public void setReadyCallback(ReadyCallback callback) + { + // No need to for the ready callback. + } + + @Override public void close() { if(_fd != null) diff --git a/java/src/Ice/src/main/java/IceInternal/TcpTransceiver.java b/java/src/Ice/src/main/java/IceInternal/TcpTransceiver.java index f837eb98776..daa1dda88eb 100644 --- a/java/src/Ice/src/main/java/IceInternal/TcpTransceiver.java +++ b/java/src/Ice/src/main/java/IceInternal/TcpTransceiver.java @@ -19,7 +19,7 @@ final class TcpTransceiver implements Transceiver, WSTransceiverDelegate } @Override - public void setReadyCallback(EventHandler.ReadyCallback callback) + public void setReadyCallback(ReadyCallback callback) { // No need of the callback } diff --git a/java/src/Ice/src/main/java/IceInternal/ThreadPool.java b/java/src/Ice/src/main/java/IceInternal/ThreadPool.java index e95a18a9492..2d8fd193101 100644 --- a/java/src/Ice/src/main/java/IceInternal/ThreadPool.java +++ b/java/src/Ice/src/main/java/IceInternal/ThreadPool.java @@ -273,7 +273,7 @@ public final class ThreadPool _selector.initialize(handler); handler.setReadyCallback( - new EventHandler.ReadyCallback() + new ReadyCallback() { public void ready(int op, boolean value) { diff --git a/java/src/Ice/src/main/java/IceInternal/ThreadPoolWorkQueue.java b/java/src/Ice/src/main/java/IceInternal/ThreadPoolWorkQueue.java index fa77235c809..c8967f6cceb 100644 --- a/java/src/Ice/src/main/java/IceInternal/ThreadPoolWorkQueue.java +++ b/java/src/Ice/src/main/java/IceInternal/ThreadPoolWorkQueue.java @@ -104,7 +104,7 @@ final class ThreadPoolWorkQueue extends EventHandler } @Override - public void setReadyCallback(EventHandler.ReadyCallback callback) + public void setReadyCallback(ReadyCallback callback) { // Ignore, we don't use the ready callback. } diff --git a/java/src/Ice/src/main/java/IceInternal/Transceiver.java b/java/src/Ice/src/main/java/IceInternal/Transceiver.java index d43d26675e0..cf1b696863f 100644 --- a/java/src/Ice/src/main/java/IceInternal/Transceiver.java +++ b/java/src/Ice/src/main/java/IceInternal/Transceiver.java @@ -12,7 +12,7 @@ package IceInternal; public interface Transceiver { java.nio.channels.SelectableChannel fd(); - void setReadyCallback(EventHandler.ReadyCallback callback); + void setReadyCallback(ReadyCallback callback); int initialize(Buffer readBuffer, Buffer writeBuffer); int closing(boolean initiator, Ice.LocalException ex); diff --git a/java/src/Ice/src/main/java/IceInternal/UdpTransceiver.java b/java/src/Ice/src/main/java/IceInternal/UdpTransceiver.java index b86986b2e05..e95b0d45aba 100644 --- a/java/src/Ice/src/main/java/IceInternal/UdpTransceiver.java +++ b/java/src/Ice/src/main/java/IceInternal/UdpTransceiver.java @@ -19,7 +19,7 @@ final class UdpTransceiver implements Transceiver } @Override - public void setReadyCallback(EventHandler.ReadyCallback callback) + public void setReadyCallback(ReadyCallback callback) { } diff --git a/java/src/Ice/src/main/java/IceInternal/WSAcceptor.java b/java/src/Ice/src/main/java/IceInternal/WSAcceptor.java index 6182ce546db..f51443a3ad5 100644 --- a/java/src/Ice/src/main/java/IceInternal/WSAcceptor.java +++ b/java/src/Ice/src/main/java/IceInternal/WSAcceptor.java @@ -18,6 +18,12 @@ final class WSAcceptor implements IceInternal.Acceptor } @Override + public void setReadyCallback(ReadyCallback callback) + { + _delegate.setReadyCallback(callback); + } + + @Override public void close() { _delegate.close(); diff --git a/java/src/Ice/src/main/java/IceInternal/WSTransceiver.java b/java/src/Ice/src/main/java/IceInternal/WSTransceiver.java index c29fa2ffba1..8ca987be7d4 100644 --- a/java/src/Ice/src/main/java/IceInternal/WSTransceiver.java +++ b/java/src/Ice/src/main/java/IceInternal/WSTransceiver.java @@ -20,7 +20,7 @@ final class WSTransceiver implements Transceiver } @Override - public void setReadyCallback(EventHandler.ReadyCallback callback) + public void setReadyCallback(ReadyCallback callback) { _readyCallback = callback; _delegate.setReadyCallback(callback); @@ -1519,7 +1519,7 @@ final class WSTransceiver implements Transceiver private int _port; private String _resource; private boolean _incoming; - private EventHandler.ReadyCallback _readyCallback; + private ReadyCallback _readyCallback; private static final int StateInitializeDelegate = 0; private static final int StateConnected = 1; diff --git a/java/src/Ice/src/main/java/IceSSL/AcceptorI.java b/java/src/Ice/src/main/java/IceSSL/AcceptorI.java index ce158e9c872..f5dbc48a228 100644 --- a/java/src/Ice/src/main/java/IceSSL/AcceptorI.java +++ b/java/src/Ice/src/main/java/IceSSL/AcceptorI.java @@ -18,6 +18,12 @@ final class AcceptorI implements IceInternal.Acceptor } @Override + public void setReadyCallback(IceInternal.ReadyCallback callback) + { + // No need to for the ready callback. + } + + @Override public void close() { if(_fd != null) diff --git a/java/src/Ice/src/main/java/IceSSL/TransceiverI.java b/java/src/Ice/src/main/java/IceSSL/TransceiverI.java index 030ea4ec730..8f72d741fca 100644 --- a/java/src/Ice/src/main/java/IceSSL/TransceiverI.java +++ b/java/src/Ice/src/main/java/IceSSL/TransceiverI.java @@ -22,7 +22,7 @@ final class TransceiverI implements IceInternal.Transceiver, IceInternal.WSTrans } @Override - public void setReadyCallback(IceInternal.EventHandler.ReadyCallback callback) + public void setReadyCallback(IceInternal.ReadyCallback callback) { _readyCallback = callback; } @@ -592,7 +592,7 @@ final class TransceiverI implements IceInternal.Transceiver, IceInternal.WSTrans private String _host = ""; private String _adapterName = ""; private boolean _incoming; - private IceInternal.EventHandler.ReadyCallback _readyCallback; + private IceInternal.ReadyCallback _readyCallback; private ByteBuffer _appInput; // Holds clear-text data to be read by the application. private ByteBuffer _netInput; // Holds encrypted data read from the socket. |