NullPointerException in UndertowChunkedStream fix #3409

jooby-project · May 12, 2024 · ea3298c · ea3298c
1 parent b7f7761
commit ea3298c
Showing 1 changed file with 35 additions and 23 deletions.
diff --git a/modules/jooby-undertow/src/main/java/io/jooby/internal/undertow/UndertowChunkedStream.java b/modules/jooby-undertow/src/main/java/io/jooby/internal/undertow/UndertowChunkedStream.java
@@ -6,7 +6,7 @@
 package io.jooby.internal.undertow;
 
 import java.io.IOException;
-import java.nio.ByteBuffer;
+import java.nio.channels.ClosedChannelException;
 import java.nio.channels.ReadableByteChannel;
 
 import org.xnio.IoUtils;
@@ -53,26 +53,30 @@ public void send(
 
  @Override
  public void run() {
- ByteBuffer buffer = pooled.getBuffer();
- try {
- buffer.clear();
- int count = source.read(buffer);
- if (count == -1 || (len != -1 && total >= len)) {
- done();
- callback.onComplete(exchange, sender);
- } else {
- total += count;
- buffer.flip();
- if (len > 0) {
- if (total > len) {
- long limit = count - (total - len);
- buffer.limit((int) limit);
+ if (pooled != null && pooled.isOpen()) {
+ var buffer = pooled.getBuffer();
+ try {
+ buffer.clear();
+ int count = source.read(buffer);
+ if (count == -1 || (len != -1 && total >= len)) {
+ done();
+ callback.onComplete(exchange, sender);
+ } else {
+ total += count;
+ buffer.flip();
+ if (len > 0) {
+ if (total > len) {
+ long limit = count - (total - len);
+ buffer.limit((int) limit);
+ }
  }
+ sender.send(buffer, this);
  }
- sender.send(buffer, this);
+ } catch (IOException ex) {
+ onException(exchange, sender, ex);
  }
- } catch (IOException ex) {
- onException(exchange, sender, ex);
+ } else {
+ onException(exchange, sender, new ClosedChannelException());
  }
  }
 
@@ -88,13 +92,21 @@ public void onComplete(final HttpServerExchange exchange, final Sender sender) {
  @Override
  public void onException(
  final HttpServerExchange exchange, final Sender sender, final IOException ex) {
- done();
- callback.onException(exchange, sender, ex);
+ try {
+ callback.onException(exchange, sender, ex);
+ } finally {
+ done();
+ }
  }
 
  private void done() {
- pooled.close();
- pooled = null;
- IoUtils.safeClose(source);
+ if (pooled != null) {
+ try {
+ pooled.close();
+ IoUtils.safeClose(source);
+ } finally {
+ pooled = null;
+ }
+ }
  }
 }