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 2021/01/17 01:04:45 UTC
[cxf] branch 3.3.x-fixes updated (83b6598 -> 86c2e05)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a change to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from 83b6598 Recording .gitmergeinfo Changes
new 0064c23 CXF-8394: Fix org.apache.cxf.systest.jaxrs.JAXRSContinuationsServlet3Test.testCancelVoidOnResumedTest
new 86c2e05 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 | 14 ++++++++++++++
.../java/org/apache/cxf/systest/jaxrs/AsyncResource.java | 11 ++++++++---
2 files changed, 22 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.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 86c2e0511ba2da2d332efa314337ab9561269b52
Author: reta <dr...@gmail.com>
AuthorDate: Sat Jan 16 20:04:24 2021 -0500
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index d2b04df..e2580f1 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -489,11 +489,13 @@ B ff7b028eeea39fedeb06207753fe6dcb9b0d8cca
M 00c77f3e98985d339b4bb3488a7ea8799eefcdec
M 01eb99f3912adfb191428b5ee2fde2e7650815ff
M 02de4c435f4de72fc93291bebd953dc11d53c02d
+M 0320ad320ba88a123a5296a8060d3ac1794009f6
M 043794e29cc5ec5435787e266d7dad6ff762018e
M 04fe61b2a9931d23eaad336192fe2c3dc429c2aa
M 09ddfdeaef6f32537dba23fa6d7ef36992b3217b
M 10251d33f0f379a5bebc640466b639382cbe42bb
M 113e426f6b717925736433fe04a1b72f801dd574
+M 12a70c867e88379c520c64882ca2b261b9e9559d
M 12d2f091afde535edab04e56c9df026cc9aad743
M 147a6b416bdfa52b0dace0684f0b83d6a7561ce2
M 160f50ed9bd9391b61417716b3a67653c9e81a98
@@ -511,8 +513,10 @@ M 2275d49772676ac72bc14ebbc3173719cd72e635
M 22a365b929822d1dbe157e0f22d228cfec21e6e2
M 267b84c59053de915b2e783daf9a236a7b5df00b
M 2696ea28b67f21b310e400b990da50016b62bd90
+M 29482be8df227ddbcac01e957c84e4807211865d
M 29f9d03b69ee071d3b83e4f0509a6b6e01b96564
M 2a5629fc31676b9397233fa4819d7810bd2482ae
+M 2c7b64383d81db5e7bd14abc90fbbbf0597044af
M 2cde96f38fc835f7d0eb1e303037e572110c3399
M 2e3258cfa57a93b92d5ab17ce85a66ce9bdd5ffe
M 2e3631a3a7ddb4551c12ef67aef04ce90d635fe1
@@ -522,6 +526,7 @@ M 330f0f9d83c5e689a8db3c107b3d27a294161bbb
M 336d49d4e88641a6ffaf757185ff0ff93473322c
M 33abf4131ccc46b4027dbbba1c0347445473c1ea
M 375b065fa6c6fdc73b2d137654f5b60cc3464793
+M 39ff641f3d81d8e0b9487ae8c49ac2a5bf055bc1
M 3b119ca6630f1384b93cd718d0cd95ccabc81e91
M 3b21d2ba746fb1a78009f271f71eb0c2063e7430
M 3b851e904021f5cf9550df82c36ac445fd0efc30
@@ -567,6 +572,7 @@ M 764662ff240d8f5dc09cb059d867d9e69bf761d4
M 79466c55a2a1191df9c28a02568b82a8c3d08fbd
M 7971b506283502c26aafb97c0f6e50633f126cdd
M 79f68ec4acb91c754e1b7d118f844d787a5ce888
+M 7a05e4fb0b67a89b86ed6eee68b9416005d6f631
M 7a655b49fd6d432127a55b38f15c1212f7064196
M 7aa6e0a402b8ce7dfff8a931a507b884d7152cea
M 7b50181ebc445bb84d3463b284643432399bc0f8
@@ -583,6 +589,7 @@ M 83c9d2701fbf4ed54bd704ca7c4cf67f57e1048d
M 84bc3830fb3d320f843b43d86e90d8a7e7e871d4
M 88907f141ee80792627da3cc7846d1562f6c0238
M 8b11d6b26369650e5f4c6f3730dbb97d60927d9b
+M 8b67b6f672d25f1128924e8aac58a6f395fe3511
M 8c4f04855a5d8623daff2aa8a8856367879c624b
M 8d10e2ed1a2b2d56b0d1ad750bf576a1f06bb084
M 90cad919d00dad2aaeede8f8475c14e2c2e76ad0
@@ -590,15 +597,18 @@ M 9115be37d5a5a76b747c03452bbbf7fb2da7be56
M 92a00fc05e2437d2d0cf98099060ba4e1f6dac99
M 92d4bfe929c5d11f19c6dd2974f0f880ba7d5382
M 940c3d58c109a5dd3bfb756e1a5d15b2558fbb1b
+M 954085421900efbf89643b5ab8f187a237e42eb4
M 95c3c37092751b1d00b6f2c26642f18ebcbba878
M 972a2755ca85ba86f473b0ce46f23bf6193ced62
M 9a5b4568a94a72569caf4d012a42df6ebbe02779
+M 9bb8e487235d728bb80a90e7e2f4a9433b5ef033
M 9c17f2fb90a9929d0dc8e4f090da78547a4e7a02
M 9c2721f27e9697fa0f515e0787f75c26077d0572
M 9c37b6c321f06621334076cc61b5b31b237f634d
M 9c462e9bd614d529f0a2fd86490243ea1c858651
M 9c6958cee3e57912b07cd3907b3aa649e797b29f
M 9df9b22a4032b19ea953600ebdfa84e8c15d2370
+M 9f939eefbd41ee5c0e88b41c2e177fdbc5cbdd26
M a0f76d634d9b58a2644bc01532d7dd87b66081de
M a3682d5fefddc8daaa068e0afe98ec6070da7dd4
M a4fc3a0462f09dd6c6c920385b67e621d7e36399
@@ -613,6 +623,7 @@ M aaf6d041f6d0671a08f38133bfd5196f9ee8ad0b
M ad75417a3292e3165b1f6406b1920136a601b353
M aeb09e380af8e8e298bc569fbb82c33598fdb142
M aefdc0759e30cb44d1729f08d1f31ff516a14e03
+M b5902ef6f3e52b0a0be429a0114e59d404664080
M b70a3916daf64c15689a30e0a77bdb4c9dbaead4
M b84270df1eb3a92b9d7e05dfd7231b0580f7bb90
M b899a64b3298afc2ced04dae7955f82f29a5cd01
@@ -622,10 +633,12 @@ M bb72206d0ed811a2c32012012fdc01ec973567a3
M bbf08b76836c3d4c592d91ee2039317332599b8e
M be41158d8c65b227c77d927ace7ca30c7c6dd015
M bf1b85003e89c4b3e28384f0de476cf0e5b1af12
+M bfc509c206d67124d3f0ae46cea6963cabb8f3ca
M c0690e1fa57e0231461c9dd644d6b3c80852eef9
M c070a8f50d83b82d864884020a64d1d67f5e7c95
M c0ef051466d775c84ddb20a9a12025d4258fb18b
M c1b729ea9f0c43e6560099dbc427751fe33ee088
+M c2244fa94cd86e1bd1068f36d9fe2f88269f2a74
M c673affb1cc40a38953dd9ce6b567705fa6eef46
M cbc0fde7f85d01e379e40a7f27fe5cea20169ddf
M cbeb9a21ba4a46f1861851f5bc56ee90d89a2225
@@ -637,6 +650,7 @@ M d5ad40bf29cf57f13aaeeca31e0aac61487095b4
M d5b612c220bab496c3dab1731e56b3fea36c1b07
M d8619b13cd9ff375590946c1349f6fe374959f30
M d875ceee917237f5c344df989947aff025d45d4f
+M d88202133e39bebdb966b6ccfed57e1ff9d73638
M dca1f9a88bbd11f52cc565f4ae4bc61372ecc53b
M dccf38113b9a3566b0c2360ea2e129694938639a
M dde79e4471e12ab53dd87a0d2adee105c57b0a71
[cxf] 01/02: CXF-8394: Fix
org.apache.cxf.systest.jaxrs.JAXRSContinuationsServlet3Test.testCancelVoidOnResumedTest
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 0064c237aaba0764c70ca412d097ba856f123bc0
Author: reta <dr...@gmail.com>
AuthorDate: Sat Jan 16 12:44:12 2021 -0500
CXF-8394: Fix org.apache.cxf.systest.jaxrs.JAXRSContinuationsServlet3Test.testCancelVoidOnResumedTest
(cherry picked from commit 7ac1006b3496f7e9dc8814a1ed8c683c4a50517f)
---
.../test/java/org/apache/cxf/systest/jaxrs/AsyncResource.java | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AsyncResource.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AsyncResource.java
index 4b75774..cb7b49e 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AsyncResource.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AsyncResource.java
@@ -18,8 +18,9 @@
*/
package org.apache.cxf.systest.jaxrs;
-import java.util.Queue;
import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.TimeUnit;
import javax.ws.rs.GET;
import javax.ws.rs.POST;
@@ -97,7 +98,7 @@ public class AsyncResource {
}
private static class AsyncResponseQueue {
- Queue<AsyncResponse> queue = new ArrayBlockingQueue<>(1);
+ BlockingQueue<AsyncResponse> queue = new ArrayBlockingQueue<>(1);
public void add(AsyncResponse asyncResponse) {
queue.add(asyncResponse);
@@ -105,7 +106,11 @@ public class AsyncResource {
}
public AsyncResponse take() {
- return queue.remove();
+ try {
+ return queue.poll(50, TimeUnit.MILLISECONDS);
+ } catch (InterruptedException ex) {
+ return null;
+ }
}
}