[cxf] branch 3.3.x-fixes updated (b38444a -> 57aabd2)

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

[cxf] branch 3.3.x-fixes updated (b38444a -> 57aabd2)

reta
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 b38444a  [CXF-8403]stax2-api version conflict in cxf-rt-ws-security
     new 9d830b0  CXF-8395: Fix org.apache.cxf.workqueue.AutomaticWorkQueueTest.testEnqueueImmediate
     new 57aabd2  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                                                           | 2 ++
 core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java | 2 ++
 2 files changed, 4 insertions(+)

Reply | Threaded
Open this post in threaded view
|

[cxf] 01/02: CXF-8395: Fix org.apache.cxf.workqueue.AutomaticWorkQueueTest.testEnqueueImmediate

reta
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 9d830b00674753d06bbd02320742c69e2005da44
Author: reta <[hidden email]>
AuthorDate: Tue Jan 5 22:39:35 2021 -0500

    CXF-8395: Fix org.apache.cxf.workqueue.AutomaticWorkQueueTest.testEnqueueImmediate
   
    (cherry picked from commit f4b77a454c6affe9ae42f6060382a2412ab4f0cc)
---
 core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java b/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java
index c13698c..f40f42c 100644
--- a/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java
+++ b/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java
@@ -176,6 +176,8 @@ public class AutomaticWorkQueueTest {
                 workItems[i] = new BlockingWorkItem();
                 try {
                     workqueue.execute(workItems[i]);
+                    //wait some time to allow worker to be created and work to be assigned
+                    Thread.sleep(100L);
                 } catch (RejectedExecutionException ex) {
                     fail("failed on item[" + i + "] with: " + ex);
                 }

Reply | Threaded
Open this post in threaded view
|

[cxf] 02/02: Recording .gitmergeinfo Changes

reta
In reply to this post by reta
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 57aabd24ba62d8661a38df6392757d06188c18d6
Author: reta <[hidden email]>
AuthorDate: Wed Jan 6 17:59:11 2021 -0500

    Recording .gitmergeinfo Changes
---
 .gitmergeinfo | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitmergeinfo b/.gitmergeinfo
index 4a245ed..e1c24e3 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -579,6 +579,7 @@ M 80c92d57ab7c34f59d51c3b30d0db9ab074e8c6b
 M 8100e4d9512b2fd9ce2fe30a4b7feeaab1d691a5
 M 83c9d2701fbf4ed54bd704ca7c4cf67f57e1048d
 M 84bc3830fb3d320f843b43d86e90d8a7e7e871d4
+M 88907f141ee80792627da3cc7846d1562f6c0238
 M 8b11d6b26369650e5f4c6f3730dbb97d60927d9b
 M 8c4f04855a5d8623daff2aa8a8856367879c624b
 M 8d10e2ed1a2b2d56b0d1ad750bf576a1f06bb084
@@ -640,6 +641,7 @@ M dde79e4471e12ab53dd87a0d2adee105c57b0a71
 M de221efcb5539d4b99d8948cdc37e72d8362aa6a
 M de540657667d3e787a41c1e34d045eb4b37b183e
 M de817963ee76778478413917f71aa8e62e221b11
+M e0dbc85b5b3383c48fecb97ac11608d7b8c82cc5
 M e1237ab1f31b4b6bc601e93b8c0e4afec96668ee
 M e1b81269089d6e7cb53e949a9fde629d37bce421
 M e2210a3520f39ba2262fa6934b26bd0cd8737e67