You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2023/03/24 11:43:57 UTC
[cxf] branch 3.5.x-fixes updated (760336b057 -> 1fe6d8a72c)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a change to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
from 760336b057 Bump dependency-check-maven from 8.1.2 to 8.2.0 (#1203)
new ba7aa3c3bd CXF-8815: Fix org.apache.cxf.transport.http.asyncclient.hc5.AsyncHTTPConduitTest.testResponseSameBufferSize (#1202)
new 1fe6d8a72c Recording .gitmergeinfo Changes
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitmergeinfo | 3 +++
.../transport/http/asyncclient/hc5/CXFHttpAsyncResponseConsumer.java | 2 +-
.../apache/cxf/transport/http/asyncclient/hc5/SharedInputBuffer.java | 4 ++--
3 files changed, 6 insertions(+), 3 deletions(-)
[cxf] 02/02: Recording .gitmergeinfo Changes
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 1fe6d8a72c2253bcabc03fc124275a89d7a685d6
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Fri Mar 24 07:43:31 2023 -0400
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 3 +++
1 file changed, 3 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 7164560012..07d959ba74 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -98,6 +98,7 @@ B b740e0a7f606d9e5acb8c27dfb3a671708bb19db
B b837cc4613590e6b2a3cec9a74b4b3c958359a78
B b8fd0b15a8cb1ca1f1be2a200c0736c0eb1356ed
B b9214b2ffe3233abf7774332ec689e797e66e4ec
+B b95a78da9fbee0dafee5c50cfa86d0965e680355
B ba839e6b1f3ee5c26fd600834ea10227dd4cc317
B c0d5bad32938019dea92f99be0773abd39ad7288
B c122fbdd9e1923cdb4daaef16f2e0fd65e2498b6
@@ -115,6 +116,7 @@ B d303d5d9436fbdc0c747479fb4c6681fcc22cb35
B d30602dda6a86c80c58aa7665f1f6ac11b94845d
B d319f8a2f5ca93e7bcaa028f8026c402e1046037
B d4b9280f57018cf9c910ac22963a20140f301101
+B d5895b3a227279bc913816cf1c95bacfa3931979
B d735757f556a567f27bfa030dcd33936c5d4ce3f
B d77fd3ac9eb11bd69e5d534dffe53296e4c00ae8
B d7b9a3095d864a6b41dc0ee07dffbd0c36d7cdf6
@@ -195,6 +197,7 @@ M 62d728e7acdfc213eb461daf4dfb020855b2eb36
M 6492db36e2a282e334e0b5304c1c8348ead826a2
M 656c9459ae97e56039a77e581122e56699ea2127
M 659a083f2ff7e20df40f4e92e3aa2fed93b54ffc
+M 67d98fdc015ec4abba00cfac833e41481617c394
M 6ae75647f08feeec514f343845d9f394d7fa5553
M 6d00f9b2ca2f7fa6936fb3868e7e29594bbc70d6
M 6ea9ff22de288343f78f73e44f47983888cbf0b2
[cxf] 01/02: CXF-8815: Fix org.apache.cxf.transport.http.asyncclient.hc5.AsyncHTTPConduitTest.testResponseSameBufferSize (#1202)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit ba7aa3c3bd431ac7fd0b6a7697371bcefed8f9b2
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Thu Mar 23 20:27:20 2023 -0400
CXF-8815: Fix org.apache.cxf.transport.http.asyncclient.hc5.AsyncHTTPConduitTest.testResponseSameBufferSize (#1202)
(cherry picked from commit 6205a9b67eaacb348bb1173b14f0d20b0ae7b5ea)
(cherry picked from commit 2e85a3ce95919e03c2fa87e1e4006220aa0b8f32)
---
.../transport/http/asyncclient/hc5/CXFHttpAsyncResponseConsumer.java | 2 +-
.../apache/cxf/transport/http/asyncclient/hc5/SharedInputBuffer.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/rt/transports/http-hc5/src/main/java/org/apache/cxf/transport/http/asyncclient/hc5/CXFHttpAsyncResponseConsumer.java b/rt/transports/http-hc5/src/main/java/org/apache/cxf/transport/http/asyncclient/hc5/CXFHttpAsyncResponseConsumer.java
index 297bc8f3dc..d8851635ba 100644
--- a/rt/transports/http-hc5/src/main/java/org/apache/cxf/transport/http/asyncclient/hc5/CXFHttpAsyncResponseConsumer.java
+++ b/rt/transports/http-hc5/src/main/java/org/apache/cxf/transport/http/asyncclient/hc5/CXFHttpAsyncResponseConsumer.java
@@ -79,7 +79,7 @@ public class CXFHttpAsyncResponseConsumer implements AsyncResponseConsumer<Boole
for (int i = 0; i < 5; i++) {
// Only consume content when the work was accepted by the work queue
if (outstream.retrySetHttpResponse(response)) {
- buf.consumeContent(src);
+ buf.consumeContent(src, completed);
break;
}
}
diff --git a/rt/transports/http-hc5/src/main/java/org/apache/cxf/transport/http/asyncclient/hc5/SharedInputBuffer.java b/rt/transports/http-hc5/src/main/java/org/apache/cxf/transport/http/asyncclient/hc5/SharedInputBuffer.java
index 994b6ceb0e..7b7e705869 100644
--- a/rt/transports/http-hc5/src/main/java/org/apache/cxf/transport/http/asyncclient/hc5/SharedInputBuffer.java
+++ b/rt/transports/http-hc5/src/main/java/org/apache/cxf/transport/http/asyncclient/hc5/SharedInputBuffer.java
@@ -69,7 +69,7 @@ public class SharedInputBuffer extends ExpandableBuffer {
}
}
- public int consumeContent(final ByteBuffer buffer) throws IOException {
+ public int consumeContent(final ByteBuffer buffer, boolean last) throws IOException {
if (this.shutdown) {
return -1;
}
@@ -88,7 +88,7 @@ public class SharedInputBuffer extends ExpandableBuffer {
totalRead += bytesRead;
}
- if (bytesRead == -1) {
+ if (last) {
this.endOfStream = true;
}