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

minor clean ups and removed debug 

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2997 7e9141cc-0065-0410-87d8-b60c137991c4
This commit is contained in:
Greg Wilkins 2011-04-11 08:18:01 +00:00
parent f09263fa63
commit e5bad59c14
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jetty-server/src/main/resources/org/eclipse/jetty/server/jmx/Connector-mbean.properties
View File

@ -1,7 +1,8 @@
Connector: HTTP Connector. Connector: HTTP Connector.
server: MObject:RO:The server for this connector server: MObject:RO:The server for this connector
headerBufferSize: The size of the header buffer requestHeaderSize: The size of a request header buffer
requestBufferSize: The size of a request content buffer requestBufferSize: The size of a request content buffer
responseHeaderSize: The size of a response header buffer
responseBufferSize: The size of a response content buffer responseBufferSize: The size of a response content buffer
integralPort: Port to use for integral redirections integralPort: Port to use for integral redirections
integralScheme: Scheme to use for integral redirections integralScheme: Scheme to use for integral redirections

2
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java
View File

@ -406,7 +406,7 @@ public class ServletHolder extends Holder<Servlet> implements UserIdentity.Scope
else else
{ {
_servletHandler.getServletContext().log("unavailable",e); _servletHandler.getServletContext().log("unavailable",e);
_unavailableEx=new UnavailableException(e.toString(),-1); _unavailableEx=new UnavailableException(String.valueOf(e),-1);
_unavailable=-1; _unavailable=-1;
} }
} }

2
jetty-websocket/src/main/java/org/eclipse/jetty/websocket/TestClient.java
View File

@ -59,7 +59,7 @@ public class TestClient
if (opcode == WebSocketConnectionD06.OP_CLOSE) if (opcode == WebSocketConnectionD06.OP_CLOSE)
{ {
byte[] data=buffer.asArray(); byte[] data=buffer.asArray();
System.err.println("CLOSED: "+((0xff&data[0])*0x100+(0xff&data[1]))+" "+new String(data,2,data.length-2,StringUtil.__UTF8)); // System.err.println("CLOSED: "+((0xff&data[0])*0x100+(0xff&data[1]))+" "+new String(data,2,data.length-2,StringUtil.__UTF8));
_generator.addFrame((byte)0x8,WebSocketConnectionD06.OP_CLOSE,data,0,data.length,_socket.getSoTimeout()); _generator.addFrame((byte)0x8,WebSocketConnectionD06.OP_CLOSE,data,0,data.length,_socket.getSoTimeout());
_generator.flush(_socket.getSoTimeout()); _generator.flush(_socket.getSoTimeout());
_socket.shutdownOutput(); _socket.shutdownOutput();

6
test-jetty-webapp/src/main/java/com/acme/Dump.java
View File

@ -200,7 +200,11 @@ public class Dump extends HttpServlet
response.addHeader("Dump","onTimeout"); response.addHeader("Dump","onTimeout");
try try
{ {
dump(response,data,chars,block,dribble,flush); if (!dump(response,data,chars,block,dribble,flush))
{
response.setContentType("text/plain");
response.getOutputStream().println("EXPIRED");
}
continuation.complete(); continuation.complete();
} }
catch (IOException e) catch (IOException e)