diff options
Diffstat (limited to 'java/src/IceInternal/UdpTransceiver.java')
| -rw-r--r-- | java/src/IceInternal/UdpTransceiver.java | 44 |
1 files changed, 15 insertions, 29 deletions
diff --git a/java/src/IceInternal/UdpTransceiver.java b/java/src/IceInternal/UdpTransceiver.java index 1d72e954f21..260bdd50774 100644 --- a/java/src/IceInternal/UdpTransceiver.java +++ b/java/src/IceInternal/UdpTransceiver.java @@ -228,36 +228,27 @@ final class UdpTransceiver implements Transceiver public Ice.ConnectionInfo getInfo() { - assert(_fd != null); - Ice.UDPConnectionInfo info = new Ice.UDPConnectionInfo(); - java.net.DatagramSocket socket = _fd.socket(); - info.localAddress = socket.getLocalAddress().getHostAddress(); - info.localPort = socket.getLocalPort(); - if(_state == StateNotConnected) + if(_fd != null) { - if(_peerAddr != null) - { - info.remoteAddress = _peerAddr.getAddress().getHostAddress(); - info.remotePort = _peerAddr.getPort(); - } - else + java.net.DatagramSocket socket = _fd.socket(); + info.localAddress = socket.getLocalAddress().getHostAddress(); + info.localPort = socket.getLocalPort(); + if(_state == StateNotConnected) { - info.remoteAddress = ""; - info.remotePort = -1; - } - } - else - { - if(socket.getInetAddress() != null) - { - info.remoteAddress = socket.getInetAddress().getHostAddress(); - info.remotePort = socket.getPort(); + if(_peerAddr != null) + { + info.remoteAddress = _peerAddr.getAddress().getHostAddress(); + info.remotePort = _peerAddr.getPort(); + } } else { - info.remoteAddress = ""; - info.remotePort = -1; + if(socket.getInetAddress() != null) + { + info.remoteAddress = socket.getInetAddress().getHostAddress(); + info.remotePort = socket.getPort(); + } } } if(_mcastAddr != null) @@ -265,11 +256,6 @@ final class UdpTransceiver implements Transceiver info.mcastAddress = _mcastAddr.getAddress().getHostAddress(); info.mcastPort = _mcastAddr.getPort(); } - else - { - info.mcastAddress = ""; - info.mcastPort = -1; - } return info; } |