diff options
author | Jon Marius Venstad <venstad@gmail.com> | 2020-09-18 15:29:26 +0200 |
---|---|---|
committer | Jon Marius Venstad <venstad@gmail.com> | 2020-09-18 15:29:26 +0200 |
commit | 7e814691df005b6992b4c0e8352ff95e8775bf8d (patch) | |
tree | 3c064e227c9b6613acb6392a4daea44ba9ac8ac0 | |
parent | 3f18f634d0cd82d71be52c8c1a98f619b48b4ae3 (diff) |
Deprecate and ignore impossible outcome of sending to MBus
-rw-r--r-- | documentapi/src/main/java/com/yahoo/documentapi/Result.java | 1 | ||||
-rw-r--r-- | documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusAsyncSession.java | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/Result.java b/documentapi/src/main/java/com/yahoo/documentapi/Result.java index 1afd08bd756..9b77090ea6d 100644 --- a/documentapi/src/main/java/com/yahoo/documentapi/Result.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/Result.java @@ -82,6 +82,7 @@ public class Result { /** The request failed, and retrying is pointless. */ FATAL_ERROR, /** Condition specified in operation not met error */ + @Deprecated(since = "7", forRemoval = true) // TODO: Remove on Vespa 8 — this is a Response outcome, not a Result outcome. CONDITION_NOT_MET_ERROR } 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 113b74a3d04..f505a0ef1cb 100644 --- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusAsyncSession.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusAsyncSession.java @@ -238,7 +238,6 @@ public class MessageBusAsyncSession implements MessageBusSession, AsyncSession { private static Result.ResultType messageBusErrorToResultType(int messageBusError) { switch (messageBusError) { case ErrorCode.SEND_QUEUE_FULL: return Result.ResultType.TRANSIENT_ERROR; - case DocumentProtocol.ERROR_TEST_AND_SET_CONDITION_FAILED: return Result.ResultType.CONDITION_NOT_MET_ERROR; default: return Result.ResultType.FATAL_ERROR; } } |