Merge pull request #114 from dwightguth/race

fix race between NGInputStream and NGOutputStream on the output socket
facebookarchive · Jan 17, 2018 · 0007cab · 0007cab
2 parents 9acfd39 + d29e253
commit 0007cab
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/nailgun-server/src/main/java/com/martiansoftware/nailgun/NGInputStream.java b/nailgun-server/src/main/java/com/martiansoftware/nailgun/NGInputStream.java
@@ -333,8 +333,10 @@ private synchronized void waitForChunk() throws IOException {
     }
 
     private synchronized void sendSendInput() throws IOException {
-        out.writeInt(0);
-        out.writeByte(NGConstants.CHUNKTYPE_SENDINPUT);
+        synchronized(out) {
+          out.writeInt(0);
+          out.writeByte(NGConstants.CHUNKTYPE_SENDINPUT);
+        }
         out.flush();
         started = true;
     }