diff options
| -rw-r--r-- | container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletRequestReader.java | 8 | ||||
| -rw-r--r-- | eval/src/vespa/eval/instruction/simple_join_count.h | 2 | ||||
| -rw-r--r-- | parent/pom.xml | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletRequestReader.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletRequestReader.java index bcef4af6620..3703878f595 100644 --- a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletRequestReader.java +++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletRequestReader.java @@ -217,8 +217,12 @@ class ServletRequestReader { synchronized (monitor) { errorDuringRead = t; - if (state != State.READING) return; - state = State.ALL_DATA_READ; + if (state == State.REQUEST_CONTENT_CLOSED) { + return; + } + if (state == State.READING) { + state = State.ALL_DATA_READ; + } shouldCloseRequestContentChannel = numberOfOutstandingUserCalls == 0; if (shouldCloseRequestContentChannel) { state = State.REQUEST_CONTENT_CLOSED; diff --git a/eval/src/vespa/eval/instruction/simple_join_count.h b/eval/src/vespa/eval/instruction/simple_join_count.h index a566d2a7e68..1c74388d914 100644 --- a/eval/src/vespa/eval/instruction/simple_join_count.h +++ b/eval/src/vespa/eval/instruction/simple_join_count.h @@ -16,7 +16,7 @@ class SimpleJoinCount : public tensor_function::Op2 private: uint64_t _dense_factor; public: - SimpleJoinCount(const TensorFunction &lhs_in, const TensorFunction &rhs_in, size_t dense_factor_in); + SimpleJoinCount(const TensorFunction &lhs_in, const TensorFunction &rhs_in, uint64_t dense_factor_in); InterpretedFunction::Instruction compile_self(const ValueBuilderFactory &factory, Stash &stash) const override; bool result_is_mutable() const override { return true; } uint64_t dense_factor() const { return _dense_factor; } diff --git a/parent/pom.xml b/parent/pom.xml index fd076c5cc35..645ec46a901 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1061,7 +1061,7 @@ <org.json.version>20220320</org.json.version> <org.lz4.version>1.8.0</org.lz4.version> <prometheus.client.version>0.6.0</prometheus.client.version> - <protobuf.version>3.19.2</protobuf.version> + <protobuf.version>3.19.6</protobuf.version> <spifly.version>1.3.5</spifly.version> <surefire.version>2.22.2</surefire.version> <zookeeper.client.version>3.8.0</zookeeper.client.version> |