changes after feedback from Tibor Digana

ceki · ceki · commit b6fb6e3b1d7e · 2021-07-09T00:23:22.000+02:00
Signed-off-by: Ceki Gulcu &lt;ceki@qos.ch&gt;
diff --git a/slf4j-simple/src/main/java/org/slf4j/impl/SimpleLogger.java b/slf4j-simple/src/main/java/org/slf4j/impl/SimpleLogger.java
@@ -159,10 +159,7 @@ public class SimpleLogger extends MarkerIgnoringBase {
     protected static final int LOG_LEVEL_OFF = LOG_LEVEL_ERROR + 10;
 
     private static boolean INITIALIZED = false;
-    static SimpleLoggerConfiguration CONFIG_PARAMS = null;
-
-    private static final long MAX_TRY_LOCK_DURATION = 200L;
-    static ReentrantLock lock = new ReentrantLock();
+    static private SimpleLoggerConfiguration CONFIG_PARAMS = null;
 
     static void lazyInit() {
         if (INITIALIZED) {
@@ -320,15 +317,12 @@ protected String renderLevel(int level) {
     void write(StringBuilder buf, Throwable t) {
         PrintStream targetStream = CONFIG_PARAMS.outputChoice.getTargetPrintStream();
 
-        try {
-            lock.tryLock(MAX_TRY_LOCK_DURATION, TimeUnit.MILLISECONDS);
+        synchronized (CONFIG_PARAMS) {
             targetStream.println(buf.toString());
             writeThrowable(t, targetStream);
             targetStream.flush();
-        } catch (InterruptedException e) {
-        } finally {
-            lock.unlock();
         }
+
     }
 
     protected void writeThrowable(Throwable t, PrintStream targetStream) {
diff --git a/slf4j-simple/src/test/java/org/slf4j/simple/multiThreadedExecution/MultithereadedExecutionTest.java b/slf4j-simple/src/test/java/org/slf4j/simple/multiThreadedExecution/MultithereadedExecutionTest.java
@@ -90,7 +90,7 @@ class WithException implements Runnable {
         Logger logger = LoggerFactory.getLogger(WithException.class);
 
         @Override
-        public void run() { // TODO Auto-generated method stub
+        public void run() { 
             int i = 0;
 
             while (!signal) {
@@ -106,7 +106,7 @@ public void run() { // TODO Auto-generated method stub
 
         }
     }
-
+ 
     class Other implements Runnable {
         Throwable throwable;
         Logger logger = LoggerFactory.getLogger(Other.class);
diff --git a/slf4j-simple/src/test/java/org/slf4j/simple/multiThreadedExecution/StateCheckingPrintStream.java b/slf4j-simple/src/test/java/org/slf4j/simple/multiThreadedExecution/StateCheckingPrintStream.java
@@ -36,8 +36,6 @@ enum State {
         INITIAL, UNKNOWN, HELLO, THROWABLE, AT1, AT2, OTHER;
     }
 
-    PrintStream other;
-
     List<String> stringList = Collections.synchronizedList(new ArrayList<String>());
 
     State currentState = State.INITIAL;

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ class WithException implements Runnable {`
`90`	`90`	`Logger logger = LoggerFactory.getLogger(WithException.class);`
`91`	`91`
`92`	`92`	`@Override`
`93`		`- public void run() { // TODO Auto-generated method stub`
	`93`	`+ public void run() {`
`94`	`94`	`int i = 0;`
`95`	`95`
`96`	`96`	`while (!signal) {`
`@@ -106,7 +106,7 @@ public void run() { // TODO Auto-generated method stub`
`106`	`106`
`107`	`107`	`}`
`108`	`108`	`}`
`109`		`-`
	`109`	`+`
`110`	`110`	`class Other implements Runnable {`
`111`	`111`	`Throwable throwable;`
`112`	`112`	`Logger logger = LoggerFactory.getLogger(Other.class);`
Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,6 @@ enum State {`
`36`	`36`	`INITIAL, UNKNOWN, HELLO, THROWABLE, AT1, AT2, OTHER;`
`37`	`37`	`}`
`38`	`38`
`39`		`- PrintStream other;`
`40`		`-`
`41`	`39`	`List<String> stringList = Collections.synchronizedList(new ArrayList<String>());`
`42`	`40`
`43`	`41`	`State currentState = State.INITIAL;`