diff options
author | Jon Marius Venstad <venstad@gmail.com> | 2021-01-07 10:29:36 +0100 |
---|---|---|
committer | Jon Marius Venstad <venstad@gmail.com> | 2021-01-07 11:01:42 +0100 |
commit | fc0f8308ed7cc26554704c8dfec3707b4033f8e3 (patch) | |
tree | ca33ed79154452c63bb3bdc7a404c79f240dd397 | |
parent | 1cd827d49c5f287a8ce5de6922c3c00d30a0895b (diff) |
Check for TaS-failed before not-found in mbus async session reply parsing
2 files changed, 4 insertions, 4 deletions
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusAsyncSession.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusAsyncSession.java index 875b74025d0..5def71e2d81 100644 --- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusAsyncSession.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusAsyncSession.java @@ -277,13 +277,13 @@ public class MessageBusAsyncSession implements MessageBusSession, AsyncSession { } private static Response.Outcome toOutcome(Reply reply) { - if ( reply instanceof UpdateDocumentReply && ! ((UpdateDocumentReply) reply).wasFound() - || reply instanceof RemoveDocumentReply && ! ((RemoveDocumentReply) reply).wasFound()) - return NOT_FOUND; if (reply.getErrorCodes().contains(DocumentProtocol.ERROR_NO_SPACE)) return INSUFFICIENT_STORAGE; if (reply.getErrorCodes().contains(DocumentProtocol.ERROR_TEST_AND_SET_CONDITION_FAILED)) return CONDITION_FAILED; + if ( reply instanceof UpdateDocumentReply && ! ((UpdateDocumentReply) reply).wasFound() + || reply instanceof RemoveDocumentReply && ! ((RemoveDocumentReply) reply).wasFound()) + return NOT_FOUND; return ERROR; } 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 47530e2c6e2..1fefe2e0c7e 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 @@ -652,7 +652,7 @@ public class DocumentV1ApiHandler extends AbstractRequestHandler { return true; if ( ! lock.tryLock()) - throw new IllegalStateException("Concurrent attempts at dispatch — this is a bug"); + throw new IllegalStateException("Concurrent attempts at dispatch — this is a bug"); try { if (operation == null) |