Skip to content

Commit 593e998

Browse files
committed
provides fixes for WrappedDirectBufferByteBuf
uncomments largePayload tests Signed-off-by: Oleh Dokuka <shadowgun@i.ua>
1 parent 9490045 commit 593e998

File tree

3 files changed

+11
-6
lines changed

3 files changed

+11
-6
lines changed

rsocket-transport-aeron/src/main/java/io/rsocket/transport/aeron/AeronClientTransport.java

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,9 @@ public Mono<DuplexConnection> connect() {
117117

118118
return Mono.error(
119119
new TimeoutException(
120-
"Timeout on send SetupFrame { connection: [{}]; stream: [{}]; channel: [{}] }"));
120+
String.format(
121+
"Timeout on send SetupFrame { connection: [%s]; stream: [%s]; channel: [%s] }",
122+
connectionId, streamId, channel)));
121123
}
122124

123125
CloseHelper.quietClose(serverManagementPublication);
@@ -170,8 +172,7 @@ public void onAvailableImage(Image image) {
170172

171173
final NanoClock nanoClock = aeron.context().nanoClock();
172174
final long nowNs = nanoClock.nanoTime();
173-
final long deadlineNs =
174-
nowNs + aeron.context().keepAliveIntervalNs() * 1000;
175+
final long deadlineNs = nowNs + timeoutNs;
175176

176177
idleStrategy.reset();
177178
for (; ; ) {
@@ -213,7 +214,12 @@ public void onAvailableImage(Image image) {
213214
public static AeronClientTransport createUdp(
214215
Aeron aeron, String host, int port, EventLoopGroup resources) {
215216
final Supplier<IdleStrategy> idleStrategySupplier =
216-
() -> new BackoffIdleStrategy(/* maxSpins */ 100, /* maxYields */ 1000, /* minParkPeriodNs */ 10000, /* maxParkPeriodNs */100000);
217+
() ->
218+
new BackoffIdleStrategy(
219+
/* maxSpins */ 100, /* maxYields */
220+
1000, /* minParkPeriodNs */
221+
10000, /* maxParkPeriodNs */
222+
100000);
217223
return new AeronClientTransport(
218224
aeron,
219225
new ChannelUriStringBuilder()

rsocket-transport-aeron/src/main/java/io/rsocket/transport/aeron/WrappedDirectBufferByteBuf.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,10 +230,10 @@ public int nioBufferCount() {
230230

231231
@Override
232232
public ByteBuffer nioBuffer(int index, int length) {
233-
// FIXME: works incorrectly
234233
final ByteBuffer byteBuffer =
235234
BufferUtil.allocateDirectAligned(length, BitUtil.CACHE_LINE_LENGTH);
236235
directBuffer.getBytes(index, byteBuffer, length);
236+
byteBuffer.flip();
237237
return byteBuffer;
238238
}
239239

rsocket-transport-aeron/src/test/resources/logback-test.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525

2626
<logger name="io.rsocket.transport.netty" level="INFO"/>
2727
<logger name="io.rsocket.FrameLogger" level="INFO"/>
28-
<logger name="io.rsocket.fragmentation.FragmentationDuplexConnection" level="INFO"/>
2928
<logger name="io.rsocket.transport.netty" level="INFO"/>
3029
<logger name="io.rsocket.core.RSocketRequester" level="DEBUG"/>
3130
<logger name="io.rsocket.core.RSocketResponder" level="DEBUG"/>

0 commit comments

Comments
 (0)