Skip to content
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

Jump to bottom

support handle of exception from onResponse or onError #4401

Merged
merged 4 commits into from
Jun 28, 2019
Merged

support handle of exception from onResponse or onError #4401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1866f94
AsyncRpcResult should handle exception when registering callback
chickenlj Jun 24, 2019
fee86e4
get the next future status
chickenlj Jun 26, 2019
0796542
Merge branch '2.7.3-release' of https://github.com/apache/incubator-d…
chickenlj Jun 26, 2019
1ae6b85
Merge branch '2.7.3-release' into thenApplyWithContext-4152
chickenlj Jun 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 5 additions & 4 deletions dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/AsyncRpcResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,14 +138,15 @@ public Object recreate() throws Throwable {

@Override
public Result whenCompleteWithContext(BiConsumer<Result, Throwable> fn) {
this.whenComplete((v, t) -> {
CompletableFuture<Result> future = this.whenComplete((v, t) -> {
beforeContext.accept(v, t);
fn.accept(v, t);
afterContext.accept(v, t);
});
// You may need to return a new Result instance representing the next async stage,
// like thenApply will return a new CompletableFuture.
return this;

AsyncRpcResult nextStage = new AsyncRpcResult(this);
nextStage.subscribeTo(future);
return nextStage;
}

public void subscribeTo(CompletableFuture<?> future) {
Expand Down
21 changes: 6 additions & 15 deletions ...-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/ProtocolFilterWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,33 +156,24 @@ public CallbackRegistrationInvoker(Invoker<T> filterInvoker, List<Filter> filter
public Result invoke(Invocation invocation) throws RpcException {
Result asyncResult = filterInvoker.invoke(invocation);

asyncResult.whenCompleteWithContext((r, t) -> {
asyncResult = asyncResult.whenCompleteWithContext((r, t) -> {
for (int i = filters.size() - 1; i >= 0; i--) {
Filter filter = filters.get(i);
// onResponse callback
if (filter instanceof ListenableFilter) {
Filter.Listener listener = ((ListenableFilter) filter).listener();
if (listener != null) {
try {
if (t == null) {
listener.onResponse(r, filterInvoker, invocation);
} else {
listener.onError(t, filterInvoker, invocation);
}
} catch (Throwable filterError) {
t = filterError;
if (t == null) {
listener.onResponse(r, filterInvoker, invocation);
} else {
listener.onError(t, filterInvoker, invocation);
}
}
} else {
try {
filter.onResponse(r, filterInvoker, invocation);
} catch (Throwable filterError) {
t = filterError;
}
filter.onResponse(r, filterInvoker, invocation);
}
}
});

return asyncResult;
}

Expand Down