Update of /cvsroot/freenet/freenet/src/freenet
In directory sc8-pr-cvs1:/tmp/cvs-serv17224/src/freenet
Modified Files:
Version.java PeerHandler.java ConnectionHandler.java
Log Message:
6339:
Fix major bug in PeerHandler that was causing loss of messages.
Logging.
Index: Version.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/Version.java,v
retrieving revision 1.535
retrieving revision 1.536
diff -u -w -r1.535 -r1.536
--- Version.java 15 Nov 2003 22:09:58 -0000 1.535
+++ Version.java 18 Nov 2003 03:46:37 -0000 1.536
@@ -20,7 +20,7 @@
public static String protocolVersion = "1.47";
/** The build number of the current revision */
- public static final int buildNumber = 6338;
+ public static final int buildNumber = 6339;
public static final int ignoreBuildsAfter = 6500;
Index: PeerHandler.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/PeerHandler.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -w -r1.45 -r1.46
--- PeerHandler.java 7 Nov 2003 18:17:15 -0000 1.45
+++ PeerHandler.java 18 Nov 2003 03:46:37 -0000 1.46
@@ -673,7 +673,10 @@
}
if(freeConn != null) {
try {
- sendSinglePacket(freeConn, pm);
+ if(!sendSinglePacket(freeConn, pm)) {
+ freeConn = null;
+ continue;
+ }
if(messages.isEmpty() &&
messagesWithTrailers.isEmpty())
return; // Otherwise there is more to
send on another conn - if we can find one
} catch (IOException ex) {
Index: ConnectionHandler.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/ConnectionHandler.java,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -w -r1.207 -r1.208
--- ConnectionHandler.java 12 Nov 2003 20:10:34 -0000 1.207
+++ ConnectionHandler.java 18 Nov 2003 03:46:37 -0000 1.208
@@ -431,8 +431,8 @@
0, false);
// It does not matter when it gets the Identify so
timeout 0
if(logDEBUG)
- Core.logger.log(this, "Sending "+sentPacket+"
on "+this,
- Logger.DEBUG);
+ Core.logger.log(this, "Sending "+sentPacket+"
on "+this+
+ "in registerOCM",
Logger.DEBUG);
}
} catch (IOException e) {
logDEBUG("Caught "+e+" in getPacket in registerOCM");
@@ -1214,7 +1214,7 @@
peerHandler.getPacket(link, p);
if(logDEBUG)
Core.logger.log(this, "Sending
"+sentPacket+
-
" on "+this, Logger.DEBUG);
+
" on "+this+" in jobDone(B)", Logger.DEBUG);
} catch (IOException e) {
mySentPacket = sentPacket = null;
if(logDEBUG) logDEBUG("Caught "+e+" in
getPacket in jobDone");
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
