Merge pull request #58 from stuartwdouglas/flush-problem

Fix issue with flush in async IO

Author: stuartwdouglas

servlet/src/main/java/io/undertow/servlet/spec/ServletOutputStreamImpl.java

@@ -206,8 +206,13 @@ public void flush() throws IOException {
         }
         try {
             if (pooledBuffer != null) {
-                exchange.writeBlocking(pooledBuffer, false);
-                pooledBuffer = null;
+                if (listener == null) {
+                    exchange.writeBlocking(pooledBuffer, false);
+                    pooledBuffer = null;
+                } else {
+                    exchange.writeAsync(pooledBuffer, false, listenerCallback, null);
+                    pooledBuffer = null;
+                }
             }
         } catch (Exception e) {
             if (pooledBuffer != null) {

vertx/src/main/java/io/undertow/vertx/VertxHttpExchange.java

@@ -659,6 +659,7 @@ public <T> void writeAsync0(ByteBuf data, boolean last, IoCallback<T> callback,
             request.response().drainHandler(new Handler<Void>() {
                 @Override
                 public void handle(Void event) {
+                    request.response().drainHandler(null);
                     try {
                         if (last) {
                             responseDone = true;
@@ -671,7 +672,6 @@ public void handle(Void event) {
                             request.response().write(createBuffer(data));
                         }
                         queueWriteListener(callback, context, last);
-                        request.response().drainHandler(null);
                     } catch (Exception e) {
                         if (data != null && data.refCnt() > 0) {
                             data.release();