Update of /cvsroot/freenet/freenet/src/freenet/transport
In directory sc8-pr-cvs1:/tmp/cvs-serv15465/src/freenet/transport
Modified Files:
WriteSelectorLoop.java
Log Message:
6173: Add a timeout for sending DataRequests of 1 hop time. If sending a message fails
it counts as searchFailed, not as connectFailed (maybe we want an extra category?
searchFailed seems reasonable for now though). NPE paranoia, logging.
Index: WriteSelectorLoop.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/transport/WriteSelectorLoop.java,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- WriteSelectorLoop.java 5 Sep 2003 16:08:52 -0000 1.56
+++ WriteSelectorLoop.java 5 Sep 2003 17:10:34 -0000 1.57
@@ -668,8 +668,16 @@
curKey+") from
uniqueness, now "+
uniqueness.size(), Logger.DEBUG);
try {
-
currentJob.client.jobDone(currentJob.data.position()-currentJob.position,
-
localSuccess);
+ if(currentJob.data == null ||
+ currentJob.client == null)
+ Core.logger.log(this,
"currentJob.data="+currentJob.data+
+
", currentJob.client="+currentJob.client,
+
Logger.ERROR);
+ else {
+ int delta =
currentJob.data.position() -
+ currentJob.position;
+
currentJob.client.jobDone(delta, localSuccess);
+ }
} catch (Throwable t) {
Core.logger.log(this, "Caught "+t+"
notifying "+
currentJob.client+" for "+
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
