andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[#3463] EpollSocketChannel.localAddress() returns always null if Native.connect() was not able to connect directly

Browse Source 
Motivation:

Due a a regression that was introduced by b898bdd we failed to set the localAddress if the connect did not success directly.

Modifications:

Correct set localAddress in doConnect(...)

Result:

Be able to get the localAddress in all cases.
This commit is contained in:
Norman Maurer 2015-03-04 20:02:37 +01:00
parent c42ab4bfd1
commit 5a0a75fe6f
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollSocketChannel.java
View File

@ -181,13 +181,17 @@ public final class EpollSocketChannel extends AbstractEpollStreamChannel impleme
checkResolvable((InetSocketAddress) localAddress); checkResolvable((InetSocketAddress) localAddress);
} }
checkResolvable((InetSocketAddress) remoteAddress); checkResolvable((InetSocketAddress) remoteAddress);
if (super.doConnect(remoteAddress, localAddress)) {
int fd = fd().intValue(); int fd = fd().intValue();
local = Native.localAddress(fd); boolean connected = super.doConnect(remoteAddress, localAddress);
if (connected) {
remote = (InetSocketAddress) remoteAddress; remote = (InetSocketAddress) remoteAddress;
return true; return true;
} }
return false; // We always need to set the localAddress even if not connected yet
//
// See https://github.com/netty/netty/issues/3463
local = Native.localAddress(fd);
return connected;
} }
private final class EpollSocketChannelUnsafe extends EpollStreamUnsafe { private final class EpollSocketChannelUnsafe extends EpollStreamUnsafe {