Synchronization organisation

gclc/src/main/java/net/bigeon/gclc/utils/ReadingRunnable.java

@@ -265,6 +265,7 @@ public final class ReadingRunnable implements Runnable {
                     message);
             final Thread th = new Thread(waitRunn);
 
+            // Wait for the thread to actually start before unlocking the message queue.
             synchronized (start) {
                 th.start();
                 while (!waitRunn.isStarted()) {

gclc/src/main/java/net/bigeon/gclc/utils/WritingRunnable.java

@@ -143,15 +143,14 @@ public final class WritingRunnable implements Runnable {
     public void run() {
         while (running) {
             synchronized (lock) {
-                while (messages.isEmpty()) {
                 waitNextMessage();
                 if (!running) {
                     return;
                 }
-                }
                 writeMessage();
             }
         }
+
     }
 
     /** Set the running status.
@@ -166,11 +165,14 @@ public final class WritingRunnable implements Runnable {
     /** Wait for next message. */
     private void waitNextMessage() {
         try {
+            synchronized (lock) {
+                while (running && messages.isEmpty()) {
                     lock.wait(TIMEOUT);
+                }
+            }
         } catch (final InterruptedException e) {
             if (running) {
-                LOGGER.log(Level.SEVERE,
+                LOGGER.log(Level.SEVERE, "Thread interruption exception.", e); //$NON-NLS-1$
-                        "Thread interruption exception.", e); //$NON-NLS-1$
             }
             Thread.currentThread().interrupt();
         }
@@ -179,8 +181,7 @@ public final class WritingRunnable implements Runnable {
     /** Write next message to output. */
     private void writeMessage() {
         final String message = messages.poll();
-        final ByteBuffer buff = charset
+        final ByteBuffer buff = charset.encode(message + System.lineSeparator());
-                .encode(message + System.lineSeparator());
         if (buff.hasArray()) {
             try {
                 outPrint.write(buff.array());