Update of /cvsroot/freenet/freenet/src/freenet/node/states/data
In directory sc8-pr-cvs1:/tmp/cvs-serv22956/src/freenet/node/states/data
Modified Files:
SendData.java
Log Message:
6240:
Timing/logging.
Significant bugfixes in SendData (trailers).
Fix rare NPE in WSL.
Index: SendData.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/data/SendData.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -w -r1.24 -r1.25
--- SendData.java 10 Oct 2003 18:05:29 -0000 1.24
+++ SendData.java 14 Oct 2003 17:52:49 -0000 1.25
@@ -185,7 +185,7 @@
}
try {
if(inPaddingMode)
- startWritePadding();
+ sendWritePadding();
else
startWrite(bufferEndPtr);
} catch (Throwable t) {
@@ -347,11 +347,12 @@
}
protected State finish() {
- if(!(moved == length || (inPaddingMode && sentPadding >= paddingLength) ||
- (result != -1))) {
+ if(!(moved == length || (inPaddingMode && sentPadding >= paddingLength)
+ || (result != -1 && !inPaddingMode))) {
n.logger.log(this, "Not finishing because moved="+moved+"/"+length+
- ", inPaddingMode="+inPaddingMode+", sentPadding="+sentPadding+
- "/"+paddingLength+" ("+this+")", Logger.DEBUG);
+ ", inPaddingMode="+inPaddingMode+", sentPadding="+
+ sentPadding+"/"+paddingLength+" ("+this+")",
+ Logger.DEBUG);
return this;
}
if(inPaddingMode && sentPadding > paddingLength)
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
