Skip to content

Commit

Permalink
Merge branch 'refs/heads/apache-3.2' into 3.2.16-release
Browse files Browse the repository at this point in the history
AlbumenJ committed Sep 7, 2024
2 parents 4a74897 + 08c74b7 commit c2894d1
Showing 8 changed files with 32 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -136,6 +136,14 @@ public void onComplete(
}
}

@Override
public void onClose() {
if (done) {
return;
}
onCancelByRemote(TriRpcStatus.CANCELLED);
}

@Override
public void onStart() {
listener.onStart(TripleClientCall.this);
Original file line number Diff line number Diff line change
@@ -56,6 +56,8 @@ default void onComplete(
boolean isReturnTriException) {
onComplete(status, attachments);
}

void onClose();
}

/**
Original file line number Diff line number Diff line change
@@ -472,5 +472,10 @@ public void cancelByRemote(long errorCode) {
finishProcess(transportError, null, false);
});
}

@Override
public void onClose() {
executor.execute(listener::onClose);
}
}
}
Original file line number Diff line number Diff line change
@@ -483,6 +483,14 @@ public void cancelByRemote(long errorCode) {
executor.execute(() -> listener.onCancelByRemote(
TriRpcStatus.CANCELLED.withDescription("Canceled by client ,errorCode=" + errorCode)));
}

@Override
public void onClose() {
if (listener == null) {
return;
}
executor.execute(() -> listener.onCancelByRemote(TriRpcStatus.CANCELLED));
}
}

private static class ServerDecoderListener implements TriDecoder.Listener {
Original file line number Diff line number Diff line change
@@ -42,4 +42,6 @@ public interface H2TransportListener {
void onData(ByteBuf data, boolean endStream);

void cancelByRemote(long errorCode);

void onClose();
}
Original file line number Diff line number Diff line change
@@ -80,6 +80,7 @@ private void onResetRead(ChannelHandlerContext ctx, Http2ResetFrame resetFrame)

@Override
public void channelInactive(ChannelHandlerContext ctx) {
transportListener.onClose();
ctx.close();
}

Original file line number Diff line number Diff line change
@@ -36,6 +36,9 @@ public void onComplete(TriRpcStatus status, Map<String, Object> attachments) {
this.status = status;
}

@Override
public void onClose() {}

@Override
public void onMessage(byte[] message, boolean isNeedReturnException) {
this.message = message;
Original file line number Diff line number Diff line change
@@ -40,6 +40,9 @@ public void onData(ByteBuf data, boolean endStream) {}

@Override
public void cancelByRemote(long errorCode) {}

@Override
public void onClose() {}
};
DefaultHttp2Headers headers = new DefaultHttp2Headers();
headers.scheme(HTTPS.name()).path("/foo.bar").method(HttpMethod.POST.asciiName());

0 comments on commit c2894d1

Please sign in to comment.