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

[t...@freenetproject.org]

Author: toad
Date: 2007-08-11 18:03:54 +0000 (Sat, 11 Aug 2007)
New Revision: 14622

Modified:
   trunk/freenet/src/freenet/node/RequestSender.java
Log:
oh shit...

Modified: trunk/freenet/src/freenet/node/RequestSender.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestSender.java   2007-08-11 18:03:31 UTC 
(rev 14621)
+++ trunk/freenet/src/freenet/node/RequestSender.java   2007-08-11 18:03:54 UTC 
(rev 14622)
@@ -684,8 +684,9 @@
                        return;
                }

+               OpennetManager om = node.getOpennet();
        try {
-                       if(!node.addNewOpennetNode(ref)) {
+                       if(om != null /* prevent race */ && 
!node.addNewOpennetNode(ref)) {
                                // If we don't want it let somebody else have it
                                synchronized(this) {
                                        opennetNoderef = noderef;
@@ -707,7 +708,7 @@

        // Send our reference

-       Message msg = DMT.createFNPOpennetConnectReply(uid, new 
ShortBuffer(next.getOutgoingMangler().getCompressedNoderef()));
+       Message msg = DMT.createFNPOpennetConnectReply(uid, new ShortBuffer( 
om.crypto.myCompressedFullRef()));

        try {
                        next.sendAsync(msg, null, 0, this);