just catch Exception when failing to send abort

This commit is contained in:
Vaci Koblizek 2020-11-12 20:36:53 +00:00
parent ce9e1689cb
commit c8c8c8a085

View file

@ -306,7 +306,7 @@ final class RpcState<VatId> {
List<CompletionStage<RpcResponse>> tailCallsToRelease = new ArrayList<>(); List<CompletionStage<RpcResponse>> tailCallsToRelease = new ArrayList<>();
List<CompletionStage<java.lang.Void>> resolveOpsToRelease = new ArrayList<>(); List<CompletionStage<java.lang.Void>> resolveOpsToRelease = new ArrayList<>();
for (var answer : answers) { for (var answer: answers) {
if (answer.redirectedResults != null) { if (answer.redirectedResults != null) {
tailCallsToRelease.add(answer.redirectedResults); tailCallsToRelease.add(answer.redirectedResults);
answer.redirectedResults = null; answer.redirectedResults = null;
@ -317,7 +317,7 @@ final class RpcState<VatId> {
} }
} }
for (var export : exports) { for (var export: exports) {
clientsToRelease.add(export.clientHook); clientsToRelease.add(export.clientHook);
resolveOpsToRelease.add(export.resolveOp); resolveOpsToRelease.add(export.resolveOp);
export.clientHook = null; export.clientHook = null;
@ -325,13 +325,13 @@ final class RpcState<VatId> {
export.refcount = 0; export.refcount = 0;
} }
for (var imp : imports) { for (var imp: imports) {
if (imp.promise != null) { if (imp.promise != null) {
imp.promise.completeExceptionally(networkExc); imp.promise.completeExceptionally(networkExc);
} }
} }
for (var embargo : embargos) { for (var embargo: embargos) {
if (embargo.disembargo != null) { if (embargo.disembargo != null) {
embargo.disembargo.completeExceptionally(networkExc); embargo.disembargo.completeExceptionally(networkExc);
} }
@ -344,7 +344,7 @@ final class RpcState<VatId> {
FromException(exc, abort); FromException(exc, abort);
message.send(); message.send();
} }
catch (Throwable abortFailed) { catch (Exception ignored) {
} }
var onShutdown = this.connection.shutdown().handle((x, ioExc) -> { var onShutdown = this.connection.shutdown().handle((x, ioExc) -> {