Author: juiceman
Date: 2009-03-29 01:34:49 +0000 (Sun, 29 Mar 2009)
New Revision: 26257
Modified:
trunk/freenet/src/freenet/node/SSKInsertSender.java
Log:
Backports requested by Toad.
Modified: trunk/freenet/src/freenet/node/SSKInsertSender.java
===================================================================
--- trunk/freenet/src/freenet/node/SSKInsertSender.java 2009-03-28 23:04:47 UTC
(rev 26256)
+++ trunk/freenet/src/freenet/node/SSKInsertSender.java 2009-03-29 01:34:49 UTC
(rev 26257)
@@ -115,6 +115,9 @@
if(status == NOT_FINISHED)
finish(INTERNAL_ERROR, null);
} finally {
+ if(logMINOR) Logger.minor(this, "Finishing "+this);
+ if(status == NOT_FINISHED)
+ finish(INTERNAL_ERROR, null);
node.removeInsertSender(myKey, origHTL, this);
}
}
@@ -280,7 +283,7 @@
newAck = node.usm.waitFor(mf1, this);
} catch (DisconnectedException e) {
if(logMINOR) Logger.minor(this,
"Disconnected from "+next);
- break;
+ continue;
}
if(newAck == null) {
@@ -289,7 +292,7 @@
next.localRejectedOverload("Timeout2");
forwardRejectedOverload();
// Try another peer
- break;
+ continue;
}
}
Property changes on: trunk/freenet/src/freenet/node/SSKInsertSender.java
___________________________________________________________________
Added: svn:mergeinfo
+
/branches/db4o/freenet/src/freenet/node/SSKInsertSender.java:24785,25282,25290,25332,25351-25352,25355-25356,25479,25488,25505,25540,25594,25673,25713-25714,25931,25977,26240-26243
/branches/db4o/src/freenet/node/SSKInsertSender.java:25594
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
