Update of /cvsroot/freenet/freenet/src/freenet/node
In directory sc8-pr-cvs1:/tmp/cvs-serv3258/src/freenet/node
Modified Files:
ConnectionOpener.java
Log Message:
6226: Minor bugfixes
- Null out sentPacket after jobDone fails to prevent an error message.
- Prevent NPE killing OCM infolet
- Fix backoff delay problem in ConnectionOpener
Index: ConnectionOpener.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/ConnectionOpener.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ConnectionOpener.java 9 Oct 2003 00:23:40 -0000 1.17
+++ ConnectionOpener.java 9 Oct 2003 00:52:12 -0000 1.18
@@ -188,16 +188,16 @@
}
private void backoff() {
- if(currentDelay == 0) {
+ int bbd = baseBackoffDelay;
+ if(bbd == 0) {
baseBackoffDelay = startBackoffDelay;
currentDelay = startBackoffDelay +
Core.randSource.nextInt(startBackoffDelay);
} else {
- int bbd = baseBackoffDelay;
Core.logger.log(this, "baseBackoffDelay="+bbd+
", currentDelay="+currentDelay+" ("+this+")",
Logger.DEBUG);
- baseBackoffDelay = baseBackoffDelay << 1;
+ baseBackoffDelay = bbd << 1;
if(bbd <= 0) {
Core.logger.log(this, "baseBackoffDelay="+bbd+
" - <= 0 ! ("+this+")", Logger.ERROR);
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
