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

[t...@freenetproject.org]

Author: toad
Date: 2006-04-11 10:37:57 +0000 (Tue, 11 Apr 2006)
New Revision: 8507

Modified:
   trunk/freenet/src/freenet/node/KeyTracker.java
   trunk/freenet/src/freenet/node/Version.java
Log:
628: Fix NPE when get ack for a packet twice.

Modified: trunk/freenet/src/freenet/node/KeyTracker.java
===================================================================
--- trunk/freenet/src/freenet/node/KeyTracker.java      2006-04-11 03:22:38 UTC 
(rev 8506)
+++ trunk/freenet/src/freenet/node/KeyTracker.java      2006-04-11 10:37:57 UTC 
(rev 8507)
@@ -535,7 +535,10 @@
      * @throws UpdatableSortedLinkedListKilledException 
      */
     private void removeAckRequest(int seqNo) throws 
UpdatableSortedLinkedListKilledException {
-        ((QueuedAckRequest)ackRequestQueue.removeByKey(new 
Integer(seqNo))).onAcked();
+        QueuedAckRequest qr = 
(QueuedAckRequest)ackRequestQueue.removeByKey(new Integer(seqNo));
+       if(qr != null) qr.onAcked();
+       else
+               Logger.normal(this, "Removing ack request twice? Null on 
"+seqNo);
     }

     /**

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-04-11 03:22:38 UTC (rev 
8506)
+++ trunk/freenet/src/freenet/node/Version.java 2006-04-11 10:37:57 UTC (rev 
8507)
@@ -20,7 +20,7 @@
        public static final String protocolVersion = "1.0";

        /** The build number of the current revision */
-       private static final int buildNumber = 627;
+       private static final int buildNumber = 628;

        /** Oldest build of Fred we will talk to */
        private static final int lastGoodBuild = 591;