serverscanning/capnproto-java-rpc
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

combine cleanup methods

Browse source
This commit is contained in:
Vaci Koblizek 2020-12-07 18:57:22 +00:00
parent c7621d1de3
commit 23c3c789f7
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
runtime-rpc/src/main/java/org/capnproto/RpcState.java
View file

@ -441,6 +441,7 @@ final class RpcState<VatId> {
private void handleMessage(IncomingRpcMessage message) throws RpcException { private void handleMessage(IncomingRpcMessage message) throws RpcException {
var reader = message.getBody().getAs(RpcProtocol.Message.factory); var reader = message.getBody().getAs(RpcProtocol.Message.factory);
LOGGER.fine(() -> this.toString() + ": < RPC message: " + reader.which().toString());
switch (reader.which()) { switch (reader.which()) {
case UNIMPLEMENTED -> handleUnimplemented(reader.getUnimplemented()); case UNIMPLEMENTED -> handleUnimplemented(reader.getUnimplemented());
case ABORT -> handleAbort(reader.getAbort()); case ABORT -> handleAbort(reader.getAbort());
@ -463,8 +464,7 @@ final class RpcState<VatId> {
} }
} }
this.cleanupImports(); this.cleanupReferences();
this.cleanupQuestions();
} }
void handleUnimplemented(RpcProtocol.Message.Reader message) { void handleUnimplemented(RpcProtocol.Message.Reader message) {
@ -1813,17 +1813,15 @@ final class RpcState<VatId> {
} }
} }
private void cleanupImports() { private void cleanupReferences() {
while (true) { while (true) {
var disposer = (ImportDisposer)this.importRefs.poll(); var disposer = (ImportDisposer)this.importRefs.poll();
if (disposer == null) { if (disposer == null) {
return; break;
} }
disposer.dispose(); disposer.dispose();
} }
}
private void cleanupQuestions() {
while (true) { while (true) {
var disposer = (QuestionDisposer)this.questionRefs.poll(); var disposer = (QuestionDisposer)this.questionRefs.poll();
if (disposer == null) { if (disposer == null) {