UNDERTOW-791 Potential stack overflow with websockets when worker is …

…shut down
undertow-io · Jan 29, 2017 · e774426 · e774426
1 parent f1dba84
commit e774426
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/core/src/main/java/io/undertow/server/protocol/framed/AbstractFramedChannel.java b/core/src/main/java/io/undertow/server/protocol/framed/AbstractFramedChannel.java
@@ -941,6 +941,18 @@ private class FrameCloseListener implements ChannelListener<CloseableChannel> {
 
         @Override
         public void handleEvent(final CloseableChannel c) {
+
+            if (Thread.currentThread() != c.getIoThread() && !c.getWorker().isShutdown()) {
+                runInIoThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        ChannelListeners.invokeChannelListener(c, FrameCloseListener.this);
+                    }
+                });
+                return;
+            }
+
+
             if(c instanceof  StreamSinkChannel) {
                 sinkClosed = true;
             } else if(c instanceof StreamSourceChannel) {
@@ -973,16 +985,6 @@ public void run() {
 
                 return;
             }
-
-            if (Thread.currentThread() != c.getIoThread()) {
-                runInIoThread(new Runnable() {
-                    @Override
-                    public void run() {
-                        ChannelListeners.invokeChannelListener(c, FrameCloseListener.this);
-                    }
-                });
-                return;
-            }
             R receiver = AbstractFramedChannel.this.receiver;
             try {
                 if (receiver != null && receiver.isOpen() && receiver.isReadResumed()) {