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

Merged branch 'jetty-9.4.x' into 'master'.

This commit is contained in:
Simone Bordet 2017-10-06 17:09:02 +02:00
parent 63beada72e bc7d53b43f
commit c40e0ce0f3
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jetty-io/src/main/java/org/eclipse/jetty/io/FillInterest.java
View File

@ -21,8 +21,6 @@ package org.eclipse.jetty.io;
import java.io.IOException;
import java.nio.channels.ClosedChannelException;
import java.nio.channels.ReadPendingException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.concurrent.atomic.AtomicReference;
import org.eclipse.jetty.util.Callback;
@ -129,7 +127,7 @@ public abstract class FillInterest
public boolean onFail(Throwable cause)
{
if (LOG.isDebugEnabled())
LOG.debug("onFail {} {}",this,cause);
LOG.debug("onFail " + this, cause);
Callback callback = _interested.get();
if (callback != null && _interested.compareAndSet(callback, null))
{

6
jetty-io/src/main/java/org/eclipse/jetty/io/WriteFlusher.java
View File

@ -479,12 +479,12 @@ abstract public class WriteFlusher
case IDLE:
case FAILED:
if (DEBUG)
LOG.debug("ignored: {} {}", this, cause);
LOG.debug("ignored: " + this, cause);
return false;
case PENDING:
if (DEBUG)
LOG.debug("failed: {} {}", this, cause);
LOG.debug("failed: " + this, cause);
PendingState pending = (PendingState)current;
if (updateState(pending,__IDLE))
@ -493,7 +493,7 @@ abstract public class WriteFlusher
default:
if (DEBUG)
LOG.debug("failed: {} {}", this, cause);
LOG.debug("failed: " + this, cause);
if (updateState(current,new FailedState(cause)))
return false;