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

[t...@freenetproject.org]

Author: toad
Date: 2005-12-05 16:43:51 +0000 (Mon, 05 Dec 2005)
New Revision: 7669

Modified:
   trunk/freenet/src/freenet/node/InsertSender.java
   trunk/freenet/src/freenet/node/Version.java
Log:
270: (mandatory)
Major bugfix in new code.

Modified: trunk/freenet/src/freenet/node/InsertSender.java
===================================================================
--- trunk/freenet/src/freenet/node/InsertSender.java    2005-12-05 16:41:10 UTC 
(rev 7668)
+++ trunk/freenet/src/freenet/node/InsertSender.java    2005-12-05 16:43:51 UTC 
(rev 7669)
@@ -44,7 +44,6 @@
             Thread senderThread = new Thread(s, "Sender for "+uid+" to 
"+pn.getPeer());
             senderThread.setDaemon(true);
             senderThread.start();
-            makeCompletionWaiter();
                }

                void completed(boolean timeout, boolean success) {
@@ -340,6 +339,7 @@
                nodesWaitingForCompletion.add(ac);
                nodesWaitingForCompletion.notifyAll();
             }
+            makeCompletionWaiter();

             while (true) {

@@ -555,7 +555,7 @@
        }

        private synchronized void makeCompletionWaiter() {
-               if(cw != null) {
+               if(cw == null) {
                        cw = new CompletionWaiter();
                        Thread t = new Thread(cw, "Completion waiter for "+uid);
                        t.setDaemon(true);
@@ -566,7 +566,8 @@
        private class CompletionWaiter implements Runnable {

                public void run() {
-outer:         while(true) {                   
+                       Logger.minor(this, "Starting "+this);
+outer:         while(true) {
                        AwaitingCompletion[] waiters;
                        synchronized(nodesWaitingForCompletion) {
                                waiters = new 
AwaitingCompletion[nodesWaitingForCompletion.size()];
@@ -689,6 +690,10 @@
                        }
                }
                }
+               
+               public String toString() {
+                       return super.toString()+" for "+uid;
+               }
        }

        public boolean completed() {

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2005-12-05 16:41:10 UTC (rev 
7668)
+++ trunk/freenet/src/freenet/node/Version.java 2005-12-05 16:43:51 UTC (rev 
7669)
@@ -20,10 +20,10 @@
        public static final String protocolVersion = "1.0";

        /** The build number of the current revision */
-       public static final int buildNumber = 269;
+       public static final int buildNumber = 270;

        /** Oldest build of Fred we will talk to */
-       public static final int lastGoodBuild = 269;
+       public static final int lastGoodBuild = 270;

        /** The highest reported build of fred */
        public static int highestSeenBuild = buildNumber;