[freenet-cvs] r18659 - trunk/freenet/src/freenet/node

[t...@freenetproject.org]

Author: toad
Date: 2008-03-20 19:32:05 +0000 (Thu, 20 Mar 2008)
New Revision: 18659

Modified:
   trunk/freenet/src/freenet/node/RequestSender.java
Log:
Doh - wait for the pubkey only if we need it, even if we get the New message

Modified: trunk/freenet/src/freenet/node/RequestSender.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestSender.java   2008-03-20 19:18:54 UTC 
(rev 18658)
+++ trunk/freenet/src/freenet/node/RequestSender.java   2008-03-20 19:32:05 UTC 
(rev 18659)
@@ -389,6 +389,7 @@
                                        continue;
                                        }
                                        sskData = ((ShortBuffer) 
dataMessage.getObject(DMT.DATA)).getData();
+                                       if(pubKey == null) {
                                MessageFilter mfPK = 
MessageFilter.create().setSource(pn).setField(DMT.UID, 
uid).setTimeout(GET_OFFER_TIMEOUT).setType(DMT.FNPSSKPubKey);
                                Message pk;
                                        try {
@@ -419,6 +420,7 @@
                                        offers.deleteLastOffer();
                                                continue;
                                        }
+                                       }

                                if(finishSSKFromGetOffer(pn)) {
                                        if(logMINOR) Logger.minor(this, 
"Successfully fetched SSK from offer from "+pn+" for "+key);