From 04e9a0c1feba664c01245fe7524fdbde7e502ba7 Mon Sep 17 00:00:00 2001 From: Bjørn Christian Seime Date: Tue, 23 Nov 2021 12:50:43 +0100 Subject: Remove double negation in flow control logic --- .../java/com/yahoo/vespa/http/server/FeedReplyReader.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'vespaclient-container-plugin') diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedReplyReader.java b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedReplyReader.java index 1a4a845bec2..3faafd7b2e5 100644 --- a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedReplyReader.java +++ b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedReplyReader.java @@ -42,23 +42,23 @@ public class FeedReplyReader implements ReplyHandler { metric.set(MetricNames.LATENCY, latencyInSeconds, null); DocumentOperationType type = DocumentOperationType.fromMessage(reply.getMessage()); - boolean conditionNotMet = conditionNotMet(reply); - if (!conditionNotMet && reply.hasErrors()) { + boolean conditionMet = conditionMet(reply); + if (reply.hasErrors() && conditionMet) { DocumentOperationStatus status = DocumentOperationStatus.fromMessageBusErrorCodes(reply.getErrorCodes()); metricsHelper.reportFailure(type, status); metric.add(MetricNames.FAILED, 1, null); - enqueue(context, reply.getError(0).getMessage(), ErrorCode.ERROR, conditionNotMet, reply.getTrace()); + enqueue(context, reply.getError(0).getMessage(), ErrorCode.ERROR, false, reply.getTrace()); } else { metricsHelper.reportSuccessful(type, latencyInSeconds); metric.add(MetricNames.SUCCEEDED, 1, null); - if (conditionNotMet) + if (!conditionMet) metric.add(MetricNames.TEST_AND_SET_CONDITION_NOT_MET, 1, null); - enqueue(context, "Document processed.", ErrorCode.OK, false, reply.getTrace()); + enqueue(context, "Document processed.", ErrorCode.OK, !conditionMet, reply.getTrace()); } } - private static boolean conditionNotMet(Reply reply) { - return reply.hasErrors() && reply.getError(0).getCode() == DocumentProtocol.ERROR_TEST_AND_SET_CONDITION_FAILED; + private static boolean conditionMet(Reply reply) { + return !reply.hasErrors() || reply.getError(0).getCode() != DocumentProtocol.ERROR_TEST_AND_SET_CONDITION_FAILED; } private void enqueue(ReplyContext context, String message, ErrorCode status, boolean isConditionNotMet, Trace trace) { -- cgit v1.2.3