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

[t...@freenetproject.org]

Author: toad
Date: 2007-12-04 18:41:45 +0000 (Tue, 04 Dec 2007)
New Revision: 16275

Modified:
   trunk/freenet/src/freenet/node/AnnounceSender.java
Log:
Fix NPE, clarify

Modified: trunk/freenet/src/freenet/node/AnnounceSender.java
===================================================================
--- trunk/freenet/src/freenet/node/AnnounceSender.java  2007-12-04 18:37:14 UTC 
(rev 16274)
+++ trunk/freenet/src/freenet/node/AnnounceSender.java  2007-12-04 18:41:45 UTC 
(rev 16275)
@@ -53,6 +53,7 @@
                this.htl = node.maxHTL();
                this.target = target;
                this.cb = cb;
+               noderefBuf = om.crypto.myCompressedFullRef();
                logMINOR = Logger.shouldLog(Logger.MINOR, this);
        }

@@ -366,7 +367,7 @@
                // If we want it, add it and send it.
                try {
                        if(om.addNewOpennetNode(fs) != null) {
-                               sendOurRef(source);
+                               sendOurRef(source, 
om.crypto.myCompressedFullRef());
                        } else {
                                // Okay, just route it.
                        }
@@ -386,8 +387,8 @@
                return true;
        }

-       private void sendOurRef(PeerNode next) throws NotConnectedException {
-               om.sendAnnouncementReply(uid, next, 
om.crypto.myCompressedFullRef(), this);
+       private void sendOurRef(PeerNode next, byte[] ref) throws 
NotConnectedException {
+               om.sendAnnouncementReply(uid, next, ref, this);
        }

        private volatile Object totalBytesSync = new Object();