avoid race condition that would cause flush() to be called after close()

1 files changed, 4 insertions, 8 deletions

diff --git a/logserver/src/main/java/com/yahoo/logserver/handlers/archive/LogWriter.java b/logserver/src/main/java/com/yahoo/logserver/handlers/archive/LogWriter.java
index 47a9b04291d..83d6a4a0def 100644
--- a/logserver/src/main/java/com/yahoo/logserver/handlers/archive/LogWriter.java
+++ b/logserver/src/main/java/com/yahoo/logserver/handlers/archive/LogWriter.java
@@ -46,11 +46,7 @@ public class LogWriter {
      * </UL>
      */
     private Writer nextWriter() throws IOException {
-
-        if (writer != null) {
-            writer.close();
-        }
-
+        close();
         int maxAttempts = 1000;
         while (maxAttempts-- > 0) {
             String name = prefix + "-" + generation++;
@@ -119,15 +115,15 @@ public class LogWriter {
     }
 
 
-    public void flush() throws IOException {
+    public synchronized void flush() throws IOException {
         if (writer != null) {
             writer.flush();
         }
     }
 
-    public void close() throws IOException {
-        flush();
+    public synchronized void close() throws IOException {
         if (writer != null) {
+            writer.flush();
             writer.close();
             writer = null;
         }