* Matthew Toseland <[EMAIL PROTECTED]> [2008-01-02 12:58:45]:
> On Saturday 29 December 2007 11:39, Florent Daignière wrote:
> > * Florent Daignière <[EMAIL PROTECTED]> [2007-12-29 12:05:17]:
> >
> > > * [EMAIL PROTECTED] <[EMAIL PROTECTED]> [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 ?
>
> Why not just use if(isConnected()) { ... } ? As far as I can see that is
> correct: if we're not connected, we don't care about verified*.You're suggesting to revert robert's patch, wich is fine by me... as I said, I don't understand why it helps NextGen$
signature.asc
Description: Digital signature
_______________________________________________ Devl mailing list Devl@freenetproject.org http://emu.freenetproject.org/cgi-bin/mailman/listinfo/devl
