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

Jetty9 - Start counting for idleness when we register read interest. 

Otherwise it was possible that the endPoint was created, upon creation
it started counting for idleness, after a while read interested was set
and the endPoint idle timed out before having the chance to read.
This commit is contained in:
Simone Bordet 2012-08-28 11:55:01 +02:00
parent 156f07d493
commit 7a1faf3c08
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
jetty-io/src/main/java/org/eclipse/jetty/io/AbstractEndPoint.java
View File

@ -50,8 +50,8 @@ public abstract class AbstractEndPoint implements EndPoint
scheduleIdleTimeout(idleLeft > 0 ? idleLeft : getIdleTimeout()); scheduleIdleTimeout(idleLeft > 0 ? idleLeft : getIdleTimeout());
} }
}; };
private volatile long _idleTimeout; private volatile long _idleTimeout;
private volatile long _idleTimestamp=System.currentTimeMillis(); private volatile long _idleTimestamp=System.currentTimeMillis();
private volatile Connection _connection; private volatile Connection _connection;
@ -150,6 +150,7 @@ public abstract class AbstractEndPoint implements EndPoint
@Override @Override
public <C> void fillInterested(C context, Callback<C> callback) throws IllegalStateException public <C> void fillInterested(C context, Callback<C> callback) throws IllegalStateException
{ {
notIdle();
_fillInterest.register(context, callback); _fillInterest.register(context, callback);
} }
@ -158,16 +159,16 @@ public abstract class AbstractEndPoint implements EndPoint
{ {
_writeFlusher.write(context, callback, buffers); _writeFlusher.write(context, callback, buffers);
} }
protected abstract void onIncompleteFlush(); protected abstract void onIncompleteFlush();
protected abstract boolean needsFill() throws IOException; protected abstract boolean needsFill() throws IOException;
protected FillInterest getFillInterest() protected FillInterest getFillInterest()
{ {
return _fillInterest; return _fillInterest;
} }
protected WriteFlusher getWriteFlusher() protected WriteFlusher getWriteFlusher()
{ {
return _writeFlusher; return _writeFlusher;
@ -212,16 +213,16 @@ public abstract class AbstractEndPoint implements EndPoint
} }
} }
} }
return idleLeft>=0?idleLeft:0; return idleLeft>=0?idleLeft:0;
} }
return -1; return -1;
} }
@Override @Override
public String toString() public String toString()
{ {
return String.format("%s@%x{%s<r-l>%s,o=%b,is=%b,os=%b,fi=%s,wf=%s}{%s}", return String.format("%s@%x{%s<r-l>%s,o=%b,is=%b,os=%b,fi=%s,wf=%s}{%s}",
getClass().getSimpleName(), getClass().getSimpleName(),
hashCode(), hashCode(),