From 23c3c789f7a53ca8312e972991d0a39f7ea7dfad Mon Sep 17 00:00:00 2001
From: Vaci Koblizek <vaci@vaci.org>
Date: Mon, 7 Dec 2020 18:57:22 +0000
Subject: [PATCH] combine cleanup methods

---
 runtime-rpc/src/main/java/org/capnproto/RpcState.java | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

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