You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by pk...@apache.org on 2024/12/09 19:42:11 UTC

(logging-log4j2) branch 2.24.x updated: Synchronize `JeroMqAppender` test methods

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

pkarwasz pushed a commit to branch 2.24.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git


The following commit(s) were added to refs/heads/2.24.x by this push:
     new 551652a1d7 Synchronize `JeroMqAppender` test methods
551652a1d7 is described below

commit 551652a1d7cdef1becd915fc15e291483c15b317
Author: Piotr P. Karwasz <pi...@karwasz.org>
AuthorDate: Mon Sep 30 10:34:55 2024 +0200

    Synchronize `JeroMqAppender` test methods
    
    The `sendRcFalse` and `sendRcTrue` fields of `JeroMqAppender` are accessed without the necessary synchronization, which causes some test failures.
---
 .../core/appender/mom/jeromq/JeroMqAppender.java   | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/jeromq/JeroMqAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/jeromq/JeroMqAppender.java
index 2167a3dc60..c2598c1332 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/jeromq/JeroMqAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/jeromq/JeroMqAppender.java
@@ -224,22 +224,30 @@ public final class JeroMqAppender extends AbstractAppender {
         return stopped;
     }
 
-    // not public, handy for testing
-    int getSendRcFalse() {
+    /**
+     * Used in tests
+     */
+    synchronized int getSendRcFalse() {
         return sendRcFalse;
     }
 
-    // not public, handy for testing
-    int getSendRcTrue() {
+    /**
+     * Used in tests
+     */
+    synchronized int getSendRcTrue() {
         return sendRcTrue;
     }
 
-    // not public, handy for testing
-    void resetSendRcs() {
+    /**
+     * Used in tests
+     */
+    synchronized void resetSendRcs() {
         sendRcTrue = sendRcFalse = 0;
     }
 
-    // not public, handy for testing
+    /**
+     * Used in tests
+     */
     JeroMqManager getManager() {
         return manager;
     }