[freenet-cvs] r7596 - in trunk/freenet/src/freenet: io/xfer node

[t...@freenetproject.org]

Author: toad
Date: 2005-11-25 15:13:48 +0000 (Fri, 25 Nov 2005)
New Revision: 7596

Modified:
   trunk/freenet/src/freenet/io/xfer/BlockTransmitter.java
   trunk/freenet/src/freenet/node/Version.java
Log:
215:
doh

Modified: trunk/freenet/src/freenet/io/xfer/BlockTransmitter.java
===================================================================
--- trunk/freenet/src/freenet/io/xfer/BlockTransmitter.java     2005-11-25 
15:01:14 UTC (rev 7595)
+++ trunk/freenet/src/freenet/io/xfer/BlockTransmitter.java     2005-11-25 
15:13:48 UTC (rev 7596)
@@ -146,7 +146,7 @@
                        if (_prb.isAborted()) {
                                synchronized(_senderThread) {
                                        _sendComplete = true;
-                                       notifyAll();
+                                       _senderThread.notifyAll();
                                }
                                return false;
                        }
@@ -157,7 +157,7 @@
                 Logger.normal(this, "Terminating send "+_uid+" to 
"+_destination+" from "+_usm.getPortNumber()+" because node disconnected while 
waiting");
                 synchronized(_senderThread) {
                        _sendComplete = true;
-                       notifyAll();
+                       _senderThread.notifyAll();
                 }
                 return false;
             }
@@ -166,7 +166,7 @@
                                if (getNumSent() == _prb.getNumPackets()) {
                                        synchronized(_senderThread) {
                                                _sendComplete = true;
-                                               notifyAll();
+                                               _senderThread.notifyAll();
                                        }
                                        Logger.error(this, "Terminating send 
"+_uid+" to "+_destination+" from "+_usm.getPortNumber()+" as we haven't heard 
from receiver in "+SEND_TIMEOUT+"ms.");
                                        return false;
@@ -188,7 +188,7 @@
                        } else if (msg.getSpec().equals(DMT.allReceived)) {
                                synchronized(_senderThread) {
                                        _sendComplete = true;
-                                       notifyAll();
+                                       _senderThread.notifyAll();
                                }
                                return true;
                        } else if(_sendComplete) {
@@ -200,7 +200,7 @@
                        // Terminate
                        synchronized(_senderThread) {
                                _sendComplete = true;
-                               notifyAll();
+                               _senderThread.notifyAll();
                        }
                        return false;
                }

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2005-11-25 15:01:14 UTC (rev 
7595)
+++ trunk/freenet/src/freenet/node/Version.java 2005-11-25 15:13:48 UTC (rev 
7596)
@@ -20,10 +20,10 @@
        public static final String protocolVersion = "1.0";

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

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

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