Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-03-01 03:19:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merged branch 'jetty-9.2.x' into 'master'."

Browse Source 
This reverts commit db61fc2a473c98d75a30aac7fba306c62677d960.
This commit is contained in:
Simone Bordet 2015-09-29 11:31:03 +02:00
parent db61fc2a47
commit 9549b32ea6
5 changed files with 88 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
jetty-io/src/main/java/org/eclipse/jetty/io/AbstractConnection.java
View File

@ -87,7 +87,10 @@ public abstract class AbstractConnection implements Connection
// TODO always dispatch failure ?
try
{
getExecutor().execute(() ->
getExecutor().execute(new Runnable()
{
@Override
public void run()
{
try
{
@ -97,6 +100,7 @@ public abstract class AbstractConnection implements Connection
{
LOG.warn(e);
}
}
});
}
catch(RejectedExecutionException e)
@ -230,9 +234,10 @@ public abstract class AbstractConnection implements Connection
@Override
public String toString()
{
return String.format("%s@%x[%s]",
return String.format("%s@%x[%s,%s]",
getClass().getSimpleName(),
hashCode(),
_state.get(),
_endPoint);
}
@ -255,5 +260,5 @@ public abstract class AbstractConnection implements Connection
{
return String.format("AC.ReadCB@%x{%s}", AbstractConnection.this.hashCode(),AbstractConnection.this);
}
}
};
}

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

@ -554,7 +554,7 @@ public class HttpChannel implements Runnable, HttpOutput.Interceptor
_requests,
_committed.get(),
_state.getState(),
_request.getHttpURI());
_uri);
}
public void onRequest(MetaData.Request request)

6
jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java
View File

@ -558,12 +558,12 @@ public class HttpConnection extends AbstractConnection implements Runnable, Http
@Override
public String toString()
{
return String.format("%s[p=%s,g=%s,c=%s][b=%s]",
return String.format("%s[p=%s,g=%s,c=%s]",
super.toString(),
_parser,
_generator,
_channel,
BufferUtil.toDetailString(_requestBuffer));
_channel);
return super.toString()+"<--"+BufferUtil.toDetailString(_requestBuffer);
}
private class Content extends HttpInput.Content

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

@ -637,11 +637,13 @@ public class HttpInput extends ServletInputStream implements Runnable
@Override
public String toString()
{
return String.format("%s@%x[c=%d,s=%s]",
return String.format("%s@%x[r=%d,s=%s,e=%s,f=%s]",
getClass().getSimpleName(),
hashCode(),
_contentConsumed,
_state);
_contentRead,
_contentState,
_eofState,
_onError);
}
public static class PoisonPillContent extends Content

6
jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
View File

@ -2171,7 +2171,7 @@ public class Request implements HttpServletRequest
*/
public void setAuthority(String host,int port)
{
_metadata.getURI().setAuthority(host,port);
_metadata.getURI().setAuthority(host,port);;
}
/* ------------------------------------------------------------ */
@ -2254,7 +2254,7 @@ public class Request implements HttpServletRequest
getClass().getSimpleName(),
_handled ? "[" : "(",
getMethod(),
getHttpURI(),
_uri,
_handled ? "]" : ")",
hashCode());
}
@ -2327,7 +2327,7 @@ public class Request implements HttpServletRequest
IO.copy(is, os);
String content=new String(os.toByteArray(),charset==null?StandardCharsets.UTF_8:Charset.forName(charset));
if (_contentParameters == null)
_contentParameters = params == null ? new MultiMap<>() : params;
_contentParameters = params == null ? new MultiMap<String>() : params;
_contentParameters.add(mp.getName(), content);
}
os.reset();