Set writing back to false also when exceptional return

1 files changed, 6 insertions, 2 deletions

diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java b/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java
index 63fc7854a52..a692362cc5f 100644
--- a/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java
+++ b/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java
@@ -1122,8 +1122,12 @@ public class DocumentV1ApiHandler extends AbstractRequestHandler {
                 });
                 if (writing.compareAndSet(false, true)) // Occupy only a single thread for writing.
                     defaultExecutor.execute(() -> {
-                        for (Runnable write; (write = writes.poll()) != null; write.run());
-                        writing.set(false);
+                        try {
+                            for (Runnable write; (write = writes.poll()) != null; write.run());
+                        }
+                        finally {
+                            writing.set(false);
+                        }
                     });
             }
             @Override public void onEnd(JsonResponse response) throws IOException {