[UNDERTOW-2298] Avoid NPE on concurrent close/timeout

undertow-io · Jul 31, 2023 · 359aa15 · 359aa15
1 parent 7d87eef
commit 359aa15
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/servlet/src/main/java/io/undertow/servlet/spec/ServletInputStreamImpl.java b/servlet/src/main/java/io/undertow/servlet/spec/ServletInputStreamImpl.java
@@ -196,10 +196,10 @@ public int read(final byte[] b, final int off, final int len) throws IOException
 
     private void readIntoBuffer() throws IOException {
         if (pooled == null && !anyAreSet(state, FLAG_FINISHED)) {
-            pooled = bufferPool.allocate();
+            final PooledByteBuffer localPooled = pooled = bufferPool.allocate();
 
-            int res = Channels.readBlocking(channel, pooled.getBuffer());
-            pooled.getBuffer().flip();
+            int res = Channels.readBlocking(channel, localPooled.getBuffer());
+            localPooled.getBuffer().flip();
             if (res == -1) {
                 setFlags(FLAG_FINISHED);
                 pooled.close();