Update of /cvsroot/freenet/freenet/src/freenet/node/states/data
In directory sc8-pr-cvs1:/tmp/cvs-serv1585/src/freenet/node/states/data
Modified Files:
SendData.java
Log Message:
6344:
Even more stats.
Even more logging.
Catch some corner cases in .received(DataReceived)'s.
Ignore a double abort in SendData.
Index: SendData.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/data/SendData.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -w -r1.36 -r1.37
--- SendData.java 20 Nov 2003 23:05:41 -0000 1.36
+++ SendData.java 20 Nov 2003 23:54:52 -0000 1.37
@@ -125,7 +125,18 @@
*/
public final void abort(int cb) {
silent = true;
+ if(result == -1) {
result = cb;
+ } else {
+ Core.logger.log(this, "Ignoring
abort("+Presentation.getCBname(cb)+
+ " because result already
"+Presentation.getCBname(result),
+ Logger.NORMAL);
+ }
+ if(!(cb == Presentation.CB_ABORTED ||
+ cb == Presentation.CB_RESTARTED)) {
+ Core.logger.log(this, "Aborting "+this+" with non-local CB: "+
+ Presentation.getCBname(cb), new
Exception("debug"), Logger.NORMAL);
+ }
if (Core.logger.shouldLog(Logger.DEBUG, this)) {
abortedException = new Exception("debug");
Core.logger.log(
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
