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

Use the correct memoryAddress size when do a gathering write. Part of [#2680]

Browse Source
This commit is contained in:
Norman Maurer 2014-07-21 06:27:30 +02:00
parent 6f5cbf6221
commit b5a192dea4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -144,7 +144,7 @@ public final class EpollSocketChannel extends AbstractEpollChannel implements So
private boolean writeBytesMultiple( private boolean writeBytesMultiple(
EpollChannelOutboundBuffer in, int msgCount, AddressEntry[] addresses, EpollChannelOutboundBuffer in, int msgCount, AddressEntry[] addresses,
int addressCnt, int expectedWrittenBytes) throws IOException { int addressCnt, long expectedWrittenBytes) throws IOException {
boolean done = false; boolean done = false;
long writtenBytes = 0; long writtenBytes = 0;
int offset = 0; int offset = 0;
@ -323,7 +323,7 @@ public final class EpollSocketChannel extends AbstractEpollChannel implements So
AddressEntry[] addresses = epollIn.memoryAddresses(); AddressEntry[] addresses = epollIn.memoryAddresses();
int addressesCnt = epollIn.addressCount(); int addressesCnt = epollIn.addressCount();
if (addressesCnt > 1) { if (addressesCnt > 1) {
if (!writeBytesMultiple(epollIn, msgCount, addresses, addressesCnt, epollIn.addressCount())) { if (!writeBytesMultiple(epollIn, msgCount, addresses, addressesCnt, epollIn.addressSize())) {
// was not able to write everything so break here we will get notified later again once // was not able to write everything so break here we will get notified later again once
// the network stack can handle more writes. // the network stack can handle more writes.
break; break;