Skip to content

Empty Payload Response treated as Complete frame #206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 14, 2016
Merged

Empty Payload Response treated as Complete frame #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4229674
Empty Payload Response treated as Complete frame
NiteshKant Dec 12, 2016
b74ed3c
Merge branch '0.5.x' into 0.5.x-next-complete
NiteshKant Dec 14, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions reactivesocket-core/src/main/java/io/reactivesocket/frame/FrameHeaderFlyweight.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,8 @@ public static int encode(
final int frameLength = computeFrameHeaderLength(frameType, metadata.remaining(), data.remaining());

final FrameType outFrameType;

switch (frameType) {
case NEXT_COMPLETE:
case COMPLETE:
outFrameType = FrameType.RESPONSE;
flags |= FLAGS_RESPONSE_C;
Expand All @@ -162,10 +162,10 @@ public static int encode(
break;
}

int length = FrameHeaderFlyweight.encodeFrameHeader(mutableDirectBuffer, offset, frameLength, flags, outFrameType, streamId);
int length = encodeFrameHeader(mutableDirectBuffer, offset, frameLength, flags, outFrameType, streamId);

length += FrameHeaderFlyweight.encodeMetadata(mutableDirectBuffer, offset, offset + length, metadata);
length += FrameHeaderFlyweight.encodeData(mutableDirectBuffer, offset + length, data);
length += encodeMetadata(mutableDirectBuffer, offset, offset + length, metadata);
length += encodeData(mutableDirectBuffer, offset + length, data);

return length;
}
Expand All @@ -179,13 +179,10 @@ public static FrameType frameType(final DirectBuffer directBuffer, final int off

if (FrameType.RESPONSE == result) {
final int flags = flags(directBuffer, offset);
final int dataLength = dataLength(directBuffer, offset, 0);

boolean complete = FLAGS_RESPONSE_C == (flags & FLAGS_RESPONSE_C);
if (complete && 0 < dataLength) {
if (complete) {
result = FrameType.NEXT_COMPLETE;
} else if (complete) {
result = FrameType.COMPLETE;
} else {
result = FrameType.NEXT;
}
Expand Down Expand Up @@ -233,7 +230,7 @@ private static int frameLength(final DirectBuffer directBuffer, final int offset
}

private static int computeMetadataLength(final int metadataPayloadLength) {
return metadataPayloadLength + ((0 == metadataPayloadLength) ? 0 : BitUtil.SIZE_OF_INT);
return metadataPayloadLength + (0 == metadataPayloadLength? 0 : BitUtil.SIZE_OF_INT);
}

private static int metadataFieldLength(final DirectBuffer directBuffer, final int offset) {
Expand Down
9 changes: 7 additions & 2 deletions reactivesocket-core/src/main/java/io/reactivesocket/internal/RemoteSender.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,8 @@ public void onSubscribe(Subscription s) {
@Override
public void onNext(Frame frame) {
// No flow-control check
assert frame.getType() != FrameType.ERROR && frame.getType() != FrameType.COMPLETE;
FrameType frameType = frame.getType();
assert frameType != FrameType.ERROR && !isCompleteFrame(frameType);
synchronized (this) {
outstanding--;
}
Expand Down Expand Up @@ -229,10 +230,14 @@ private boolean trySendTerminalFrame(Frame frame, Throwable optionalError) {

private void unsafeSendTerminalFrameToTransport(Frame terminalFrame, Throwable optionalError) {
transportSubscription.safeOnNext(terminalFrame);
if (terminalFrame.getType() == FrameType.COMPLETE) {
if (terminalFrame.getType() == FrameType.COMPLETE || terminalFrame.getType() == FrameType.NEXT_COMPLETE) {
transportSubscription.safeOnComplete();
} else {
transportSubscription.safeOnError(optionalError);
}
}

private static boolean isCompleteFrame(FrameType frameType) {
return frameType == FrameType.COMPLETE || frameType == FrameType.NEXT_COMPLETE;
}
}
7 changes: 3 additions & 4 deletions reactivesocket-core/src/test/java/io/reactivesocket/ServerReactiveSocketTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,7 @@
import java.util.concurrent.atomic.AtomicBoolean;

import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.empty;
import static org.hamcrest.Matchers.hasSize;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.*;

public class ServerReactiveSocketTest {

Expand Down Expand Up @@ -60,7 +58,8 @@ public void testHandleResponseFrameNoError() throws Exception {
assertThat("Unexpected error.", rule.errors, is(empty()));
TestSubscriber<Frame> sendSub = sendSubscribers.iterator().next();
sendSub.request(2);
assertThat("Unexpected frame sent.", rule.connection.awaitSend().getType(), is(FrameType.COMPLETE));
assertThat("Unexpected frame sent.", rule.connection.awaitSend().getType(),
anyOf(is(FrameType.COMPLETE), is(FrameType.NEXT_COMPLETE)));
}

@Test(timeout = 2000)
Expand Down
4 changes: 2 additions & 2 deletions reactivesocket-core/src/test/java/io/reactivesocket/internal/RemoteSenderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public void testOnComplete() throws Exception {
receiverSub.assertValue(new Predicate<Frame>() {
@Override
public boolean test(Frame frame) throws Exception {
return frame.getType() == FrameType.COMPLETE;
return frame.getType() == FrameType.COMPLETE || frame.getType() == FrameType.NEXT_COMPLETE;
}
});

Expand Down Expand Up @@ -138,7 +138,7 @@ public void testOnCompleteWithBuffer() throws Exception {
receiverSub.assertValue(new Predicate<Frame>() {
@Override
public boolean test(Frame frame) throws Exception {
return frame.getType() == FrameType.COMPLETE;
return frame.getType() == FrameType.COMPLETE || frame.getType() == FrameType.NEXT_COMPLETE;
}
});
receiverSub.assertNoErrors();
Expand Down
4 changes: 2 additions & 2 deletions .../main/java/io/reactivesocket/examples/transport/tcp/requestresponse/HelloWorldClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@ public Publisher<Payload> requestResponse(Payload p) {
.connect())
.blockingFirst();

Flowable.fromPublisher(socket.requestResponse(new PayloadImpl("Hello")))
Flowable.fromPublisher(socket.requestResponse(PayloadImpl.EMPTY))
.map(payload -> payload.getData())
.map(ByteBufferUtil::toUtf8String)
.doOnNext(System.out::println)
.doOnNext(x -> System.out.println("===>>>> " + x))
.concatWith(Flowable.fromPublisher(socket.close()).cast(String.class))
.blockingFirst();
}
Expand Down