[freenet-dev] [freenet-cvs] r16834 - trunk/freenet/src/freenet/node

[Florent Daignière]

* Florent Daignière <nextgens at freenetproject.org> [2007-12-29 12:05:17]:

> * robert at freenetproject.org <robert at freenetproject.org> [2007-12-29 01:46:31]:
> 
> > Author: robert
> > Date: 2007-12-29 01:46:31 +0000 (Sat, 29 Dec 2007)
> > New Revision: 16834
> > 
> > Modified:
> >    trunk/freenet/src/freenet/node/PeerNode.java
> > Log:
> > maybe help wont-fetch-ark deadlock #2
> > 
> > 
> > Modified: trunk/freenet/src/freenet/node/PeerNode.java
> > ===================================================================
> > --- trunk/freenet/src/freenet/node/PeerNode.java	2007-12-29 01:41:06 UTC (rev 16833)
> > +++ trunk/freenet/src/freenet/node/PeerNode.java	2007-12-29 01:46:31 UTC (rev 16834)
> > @@ -2782,7 +2782,7 @@
> >  
> >  	synchronized void updateShouldDisconnectNow() {
> >  		//FIXME: We should not update VERIFIED unless we HANDSHAKE WITH THE NODE
> > -		if (isConnected()) {
> > +		if (isConnected() || verifiedIncompatibleOlderVersion || verifiedIncompatibleNewerVersion) {
> >  			verifiedIncompatibleOlderVersion = forwardInvalidVersion();
> >  			verifiedIncompatibleNewerVersion = reverseInvalidVersion();
> >  		}
> 
> I suggest you call isRoutable() instead
> 
> NextGen$

Hmm, on a latter thought, I don't understand why it helps... nor why we
are calling it from PacketSender

What about getting rid of both the "if" branch and the call in
PacketSender ?

NextGen$
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : http://emu.freenetproject.org/pipermail/devl/attachments/20071229/333e2612/attachment.pgp