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

Renamed ISession.control() to ISession.frames().

This commit is contained in:
Simone Bordet 2015-03-20 15:02:07 +01:00
parent 4107444beb
commit 2a21f8cb2f
7 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jetty-http2/http2-client/src/main/java/org/eclipse/jetty/http2/client/HTTP2ClientConnectionFactory.java
View File

@ -114,11 +114,11 @@ public class HTTP2ClientConnectionFactory implements ClientConnectionFactory
if (windowDelta > 0)
{
session.updateRecvWindow(windowDelta);
session.control(null, this, prefaceFrame, settingsFrame, new WindowUpdateFrame(0, windowDelta));
session.frames(null, this, prefaceFrame, settingsFrame, new WindowUpdateFrame(0, windowDelta));
}
else
{
session.control(null, this, prefaceFrame, settingsFrame);
session.frames(null, this, prefaceFrame, settingsFrame);
}
}

2
jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/BufferingFlowControlStrategy.java
View File

@ -138,7 +138,7 @@ public class BufferingFlowControlStrategy extends AbstractFlowControlStrategy
}
if (windowFrame != null)
session.control(stream, Callback.Adapter.INSTANCE, windowFrame, windowFrames);
session.frames(stream, Callback.Adapter.INSTANCE, windowFrame, windowFrames);
}
@Override

4
jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Session.java
View File

@ -537,11 +537,11 @@ public abstract class HTTP2Session implements ISession, Parser.Listener
private void control(IStream stream, Callback callback, Frame frame)
{
control(stream, callback, frame, Frame.EMPTY_ARRAY);
frames(stream, callback, frame, Frame.EMPTY_ARRAY);
}
@Override
public void control(IStream stream, Callback callback, Frame frame, Frame... frames)
public void frames(IStream stream, Callback callback, Frame frame, Frame... frames)
{
// We want to generate as late as possible to allow re-prioritization;
// generation will happen while processing the entries.

4
jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Stream.java
View File

@ -76,7 +76,7 @@ public class HTTP2Stream extends IdleTimeout implements IStream
public void headers(HeadersFrame frame, Callback callback)
{
notIdle();
session.control(this, callback, frame, Frame.EMPTY_ARRAY);
session.frames(this, callback, frame, Frame.EMPTY_ARRAY);
}
@Override
@ -100,7 +100,7 @@ public class HTTP2Stream extends IdleTimeout implements IStream
return;
notIdle();
localReset = true;
session.control(this, callback, frame, Frame.EMPTY_ARRAY);
session.frames(this, callback, frame, Frame.EMPTY_ARRAY);
}
@Override

4
jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/ISession.java
View File

@ -53,11 +53,11 @@ public interface ISession extends Session
* @param frame the first frame to enqueue
* @param frames additional frames to enqueue
*/
public void control(IStream stream, Callback callback, Frame frame, Frame... frames);
public void frames(IStream stream, Callback callback, Frame frame, Frame... frames);
/**
* <p>Enqueues the given PUSH_PROMISE frame to be written to the connection.</p>
* <p>Differently from {@link #control(IStream, Callback, Frame, Frame...)}, this method
* <p>Differently from {@link #frames(IStream, Callback, Frame, Frame...)}, this method
* generates atomically the stream id for the pushed stream.</p>
*
* @param stream the stream associated to the pushed stream

2
jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/SimpleFlowControlStrategy.java
View File

@ -67,6 +67,6 @@ public class SimpleFlowControlStrategy extends AbstractFlowControlStrategy
}
}
session.control(stream, Callback.Adapter.INSTANCE, sessionFrame, streamFrame);
session.frames(stream, Callback.Adapter.INSTANCE, sessionFrame, streamFrame);
}
}

2
jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HTTP2ServerSession.java
View File

@ -62,7 +62,7 @@ public class HTTP2ServerSession extends HTTP2Session implements ServerParser.Lis
settings = Collections.emptyMap();
SettingsFrame frame = new SettingsFrame(settings, false);
// TODO: consider sending a WINDOW_UPDATE to enlarge the session send window of the client.
control(null, Callback.Adapter.INSTANCE, frame, Frame.EMPTY_ARRAY);
frames(null, Callback.Adapter.INSTANCE, frame, Frame.EMPTY_ARRAY);
}
@Override