Author: toad
Date: 2005-11-26 18:08:24 +0000 (Sat, 26 Nov 2005)
New Revision: 7621

Modified:
   trunk/freenet/src/freenet/node/InsertSender.java
   trunk/freenet/src/freenet/node/Version.java
Log:
235: (mandatory)
Don't accidentally fire the same BlockTransmitter twice. Fixes an 
IllegalThreadStateException sleon reported.

Modified: trunk/freenet/src/freenet/node/InsertSender.java
===================================================================
--- trunk/freenet/src/freenet/node/InsertSender.java    2005-11-26 13:59:24 UTC 
(rev 7620)
+++ trunk/freenet/src/freenet/node/InsertSender.java    2005-11-26 18:08:24 UTC 
(rev 7621)
@@ -19,6 +19,13 @@

     public class Sender implements Runnable {

+       public Sender(BlockTransmitter bt) {
+               this.bt = bt;
+       }
+
+       // We will often have multiple simultaneous senders, so we need them to 
send separately.
+       final BlockTransmitter bt;
+       
                public void run() {
                        bt.send();
                }
@@ -192,7 +199,7 @@

             Logger.minor(this, "Sending data");
             if(receiveFailed) return;
-            Sender s = new Sender();
+            Sender s = new Sender(bt);
             Thread senderThread = new Thread(s);
             senderThread.setDaemon(true);
             senderThread.start();

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2005-11-26 13:59:24 UTC (rev 
7620)
+++ trunk/freenet/src/freenet/node/Version.java 2005-11-26 18:08:24 UTC (rev 
7621)
@@ -20,10 +20,10 @@
        public static final String protocolVersion = "1.0";

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

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

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


Reply via email to