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

jetty-9 some renaming

This commit is contained in:
Greg Wilkins 2012-07-26 19:28:19 +10:00
parent 7882a17581
commit 3cdd533361
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
View File

@ -228,7 +228,7 @@ public abstract class HttpChannel
{
if (_response.isCommitted())
throw new IllegalStateException("Committed before 100 Continues");
commit(HttpGenerator.CONTINUE_100_INFO,null);
commitResponse(HttpGenerator.CONTINUE_100_INFO,null);
}
_expect100Continue=false;
}
@ -444,7 +444,7 @@ public abstract class HttpChannel
}
HttpGenerator.ResponseInfo info = _handler.commit();
commit(info,buffer);
commitResponse(info,buffer);
return true;
}
@ -779,7 +779,7 @@ public abstract class HttpChannel
// Process content.
if (content instanceof ByteBuffer)
{
commit(_handler.commit(),(ByteBuffer)content);
commitResponse(_handler.commit(),(ByteBuffer)content);
}
else if (content instanceof InputStream)
{
@ -795,7 +795,7 @@ public abstract class HttpChannel
protected abstract int write(ByteBuffer content) throws IOException;
/* Called by the channel or application to commit a specific response info */
protected abstract void commit(ResponseInfo info, ByteBuffer content) throws IOException;
protected abstract void commitResponse(ResponseInfo info, ByteBuffer content) throws IOException;
protected abstract int getContentBufferSize();

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

@ -419,7 +419,7 @@ public class Response implements HttpServletResponse
public void sendProcessing() throws IOException
{
if (_channel.isExpecting102Processing() && !isCommitted())
_channel.commit(HttpGenerator.PROGRESS_102_INFO,null);
_channel.commitResponse(HttpGenerator.PROGRESS_102_INFO,null);
}
/* ------------------------------------------------------------ */

2
jetty-server/src/test/java/org/eclipse/jetty/server/HttpWriterTest.java
View File

@ -51,7 +51,7 @@ public class HttpWriterTest
}
@Override
protected void commit(ResponseInfo info, ByteBuffer content) throws IOException
protected void commitResponse(ResponseInfo info, ByteBuffer content) throws IOException
{
}

2
jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java
View File

@ -161,7 +161,7 @@ public class ResponseTest
}
@Override
protected void commit(ResponseInfo info, ByteBuffer content) throws IOException
protected void commitResponse(ResponseInfo info, ByteBuffer content) throws IOException
{
// TODO Auto-generated method stub

4
jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLEngineTest.java
View File

@ -158,7 +158,7 @@ public class SSLEngineTest
{
for (int l=0;l<loops;l++)
{
System.err.print('.');
// System.err.print('.');
try
{
for (int i=0; i<numConns; ++i)
@ -203,7 +203,7 @@ public class SSLEngineTest
}
finally
{
System.err.println();
// System.err.println();
}
}