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

452246 Fixed SSL hang on last chunk 

Back ported refinements from 9.3 to handle empty arrays
This commit is contained in:
Greg Wilkins 2014-11-27 18:02:03 +11:00
parent a129b0bcd1
commit 981e27b383
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,7 +46,6 @@ abstract public class WriteFlusher
{ {
private static final Logger LOG = Log.getLogger(WriteFlusher.class); private static final Logger LOG = Log.getLogger(WriteFlusher.class);
private static final boolean DEBUG = LOG.isDebugEnabled(); // Easy for the compiler to remove the code if DEBUG==false private static final boolean DEBUG = LOG.isDebugEnabled(); // Easy for the compiler to remove the code if DEBUG==false
private static final ByteBuffer[] NO_BUFFERS = new ByteBuffer[0];
private static final ByteBuffer[] EMPTY_BUFFERS = new ByteBuffer[]{BufferUtil.EMPTY_BUFFER}; private static final ByteBuffer[] EMPTY_BUFFERS = new ByteBuffer[]{BufferUtil.EMPTY_BUFFER};
private static final EnumMap<StateType, Set<StateType>> __stateTransitions = new EnumMap<>(StateType.class); private static final EnumMap<StateType, Set<StateType>> __stateTransitions = new EnumMap<>(StateType.class);
private static final State __IDLE = new IdleState(); private static final State __IDLE = new IdleState();
@ -405,11 +404,13 @@ abstract public class WriteFlusher
boolean progress=true; boolean progress=true;
while(progress && buffers!=null) while(progress && buffers!=null)
{ {
int before=buffers[0].remaining(); int before=buffers.length==0?0:buffers[0].remaining();
boolean flushed=_endPoint.flush(buffers);
int r=buffers.length==0?0:buffers[0].remaining();
if (_endPoint.flush(buffers)) if (flushed)
return null; return null;
int r=buffers[0].remaining();
progress=before!=r; progress=before!=r;
int not_empty=0; int not_empty=0;
@ -421,6 +422,7 @@ abstract public class WriteFlusher
not_empty=0; not_empty=0;
break; break;
} }
progress=true;
r=buffers[not_empty].remaining(); r=buffers[not_empty].remaining();
} }