[cxf] branch 3.4.x-fixes updated (566ec8c -> 23e18bb)

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

[cxf] branch 3.4.x-fixes updated (566ec8c -> 23e18bb)

reta
This is an automated email from the ASF dual-hosted git repository.

reta pushed a change to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.


    from 566ec8c  [CXF-8403]stax2-api version conflict in cxf-rt-ws-security
     new 26c857a  CXF-8395: Fix org.apache.cxf.workqueue.AutomaticWorkQueueTest.testEnqueueImmediate
     new 23e18bb  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                                                           | 1 +
 core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java | 2 ++
 2 files changed, 3 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.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 26c857ade6e3676aea3b64710c4beafda1ec0c57
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.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 23e18bb6dfbe081027609c8d5efcb296eefcdb3b
Author: reta <[hidden email]>
AuthorDate: Wed Jan 6 17:58:37 2021 -0500

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

diff --git a/.gitmergeinfo b/.gitmergeinfo
index 96876ba..15e29e4 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -26,5 +26,6 @@ M c0690e1fa57e0231461c9dd644d6b3c80852eef9
 M c070a8f50d83b82d864884020a64d1d67f5e7c95
 M c0ef051466d775c84ddb20a9a12025d4258fb18b
 M d6a299217dd943a3872da9b0afb7f966ab289cc0
+M e0dbc85b5b3383c48fecb97ac11608d7b8c82cc5
 M e775237e6dcb16b647d102bcbb3908d3e9fce1de
 M fb7821164ec6d7fb98dc3f8caea67465db230a14