From e314d26ab35905eff26e944df417c694ca47ccf8 Mon Sep 17 00:00:00 2001 From: Vaci Koblizek Date: Fri, 20 Nov 2020 16:27:44 +0000 Subject: [PATCH] use sendInternal rather than calling hook directly --- compiler/src/main/cpp/capnpc-java.c++ | 2 +- runtime/src/main/java/org/capnproto/AnyPointer.java | 5 +++++ runtime/src/main/java/org/capnproto/Request.java | 4 ++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/compiler/src/main/cpp/capnpc-java.c++ b/compiler/src/main/cpp/capnpc-java.c++ index 5226bc4..76ffe25 100644 --- a/compiler/src/main/cpp/capnpc-java.c++ +++ b/compiler/src/main/cpp/capnpc-java.c++ @@ -2031,7 +2031,7 @@ private: sp, " return ", paramFactory, ";\n", sp, " }\n", sp, " default Response send() {\n", - sp, " return new Response(this.getHook().send());\n", + sp, " return new Response(this.sendInternal());\n", sp, " }\n", sp, " }\n", sp, " public static final class Response\n", diff --git a/runtime/src/main/java/org/capnproto/AnyPointer.java b/runtime/src/main/java/org/capnproto/AnyPointer.java index 63d5ca4..0526237 100644 --- a/runtime/src/main/java/org/capnproto/AnyPointer.java +++ b/runtime/src/main/java/org/capnproto/AnyPointer.java @@ -221,6 +221,11 @@ public final class AnyPointer { return AnyPointer.factory; } + @Override + public RemotePromise sendInternal() { + return this.send(); + } + public RemotePromise send() { return this.getHook().send(); } diff --git a/runtime/src/main/java/org/capnproto/Request.java b/runtime/src/main/java/org/capnproto/Request.java index e1fb41d..854c008 100644 --- a/runtime/src/main/java/org/capnproto/Request.java +++ b/runtime/src/main/java/org/capnproto/Request.java @@ -16,6 +16,10 @@ public interface Request { Request getTypelessRequest(); + default RemotePromise sendInternal() { + return this.getTypelessRequest().sendInternal(); + } + static Request newBrokenRequest(FromPointerBuilder paramsFactory, Throwable exc) {