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

Synchronized the generation and enqueuing of control frames, in order to maintain a correct compression context.

This commit is contained in:
Simone Bordet 2012-02-28 17:01:30 +01:00
parent 980d728502
commit 50ead5c19c
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardSession.java
View File

@ -717,12 +717,20 @@ public class StandardSession implements ISession, Parser.Listener, Handler<Stand
{ {
if (stream != null) if (stream != null)
updateLastStreamId(stream); // TODO: not sure this is right updateLastStreamId(stream); // TODO: not sure this is right
// Synchronization is necessary, since we may have concurrent replies
// and those needs to be generated and enqueued atomically in order
// to maintain a correct compression context
synchronized (this)
{
ByteBuffer buffer = generator.control(frame); ByteBuffer buffer = generator.control(frame);
logger.debug("Queuing {} on {}", frame, stream); logger.debug("Queuing {} on {}", frame, stream);
ControlFrameBytes<C> frameBytes = new ControlFrameBytes<>(frame, buffer, handler, context); ControlFrameBytes<C> frameBytes = new ControlFrameBytes<>(frame, buffer, handler, context);
if (timeout > 0) if (timeout > 0)
frameBytes.task = scheduler.schedule(frameBytes, timeout, unit); frameBytes.task = scheduler.schedule(frameBytes, timeout, unit);
enqueueLast(frameBytes); enqueueLast(frameBytes);
}
flush(); flush();
} }