Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

demand before succeeding callback in JettyWebSocketFrameHandler 

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
This commit is contained in:
Lachlan Roberts 2019-04-16 17:19:45 +10:00 committed by Greg Wilkins
parent 812f3dbd2e
commit 15d4659cc0
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketFrameHandler.java
View File

@ -204,8 +204,17 @@ public class JettyWebSocketFrameHandler implements FrameHandler
// Demand after succeeding any received frame
Callback demandingCallback = Callback.from(()->
{
try
{
demand();
}
catch (Throwable t)
{
callback.failed(t);
return;
}
callback.succeeded();
demand();
},
callback::failed
);

11
jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientCloseTest.java
View File

@ -19,7 +19,6 @@
package org.eclipse.jetty.websocket.tests.client;
import java.io.IOException;
import java.net.URI;
import java.time.Duration;
import java.util.ArrayList;
@ -442,14 +441,10 @@ public class ClientCloseTest
session.getRemote().sendString(message);
}
}
catch (InterruptedException e)
catch (Throwable t)
{
LOG.debug("unblocked");
throw new IllegalStateException(e);
}
catch (IOException ignore)
{
LOG.debug(ignore);
LOG.debug(t);
throw new RuntimeException(t);
}
}