Apply missing changes in the branch '3'
This commit is contained in:
parent
0cd766df30
commit
734d452be2
|
@ -196,7 +196,6 @@ public abstract class AbstractDiskHttpData extends AbstractHttpData {
|
||||||
while (read > 0) {
|
while (read > 0) {
|
||||||
byteBuffer.position(read).flip();
|
byteBuffer.position(read).flip();
|
||||||
written += localfileChannel.write(byteBuffer);
|
written += localfileChannel.write(byteBuffer);
|
||||||
localfileChannel.force(false);
|
|
||||||
read = inputStream.read(bytes);
|
read = inputStream.read(bytes);
|
||||||
}
|
}
|
||||||
localfileChannel.force(false);
|
localfileChannel.force(false);
|
||||||
|
|
|
@ -98,12 +98,12 @@ public abstract class AbstractDatagramMulticastTest {
|
||||||
|
|
||||||
assertTrue(cc.joinGroup(groupAddress, iface).awaitUninterruptibly().isSuccess());
|
assertTrue(cc.joinGroup(groupAddress, iface).awaitUninterruptibly().isSuccess());
|
||||||
|
|
||||||
assertTrue(sc.write(ChannelBuffers.wrapInt(1), groupAddress).awaitUninterruptibly().isSuccess());
|
assertTrue(sc.write(ChannelBuffers.copyInt(1), groupAddress).awaitUninterruptibly().isSuccess());
|
||||||
|
|
||||||
|
|
||||||
assertTrue(mhandler.await());
|
assertTrue(mhandler.await());
|
||||||
|
|
||||||
assertTrue(sc.write(ChannelBuffers.wrapInt(1), groupAddress).awaitUninterruptibly().isSuccess());
|
assertTrue(sc.write(ChannelBuffers.copyInt(1), groupAddress).awaitUninterruptibly().isSuccess());
|
||||||
|
|
||||||
|
|
||||||
// leave the group
|
// leave the group
|
||||||
|
@ -113,7 +113,7 @@ public abstract class AbstractDatagramMulticastTest {
|
||||||
Thread.sleep(1000);
|
Thread.sleep(1000);
|
||||||
|
|
||||||
// we should not receive a message anymore as we left the group before
|
// we should not receive a message anymore as we left the group before
|
||||||
assertTrue(sc.write(ChannelBuffers.wrapInt(1), groupAddress).awaitUninterruptibly().isSuccess());
|
assertTrue(sc.write(ChannelBuffers.copyInt(1), groupAddress).awaitUninterruptibly().isSuccess());
|
||||||
|
|
||||||
sc.close().awaitUninterruptibly();
|
sc.close().awaitUninterruptibly();
|
||||||
cc.close().awaitUninterruptibly();
|
cc.close().awaitUninterruptibly();
|
||||||
|
|
|
@ -79,7 +79,7 @@ public abstract class AbstractDatagramTest {
|
||||||
Channel sc = sb.bind(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0));
|
Channel sc = sb.bind(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0));
|
||||||
|
|
||||||
Channel cc = cb.bind(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0));
|
Channel cc = cb.bind(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0));
|
||||||
assertTrue(cc.write(ChannelBuffers.wrapInt(1), sc.getLocalAddress()).awaitUninterruptibly().isSuccess());
|
assertTrue(cc.write(ChannelBuffers.copyInt(1), sc.getLocalAddress()).awaitUninterruptibly().isSuccess());
|
||||||
|
|
||||||
assertTrue(latch.await(10, TimeUnit.SECONDS));
|
assertTrue(latch.await(10, TimeUnit.SECONDS));
|
||||||
sc.close().awaitUninterruptibly();
|
sc.close().awaitUninterruptibly();
|
||||||
|
|
Loading…
Reference in New Issue
Block a user