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

[t...@freenetproject.org]

Author: toad
Date: 2005-11-29 19:39:41 +0000 (Tue, 29 Nov 2005)
New Revision: 7632

Modified:
   trunk/freenet/src/freenet/node/InsertSender.java
   trunk/freenet/src/freenet/node/RequestSender.java
   trunk/freenet/src/freenet/node/Version.java
Log:
246: (mandatory)
Minor bugfix that was causing timeouts.

Modified: trunk/freenet/src/freenet/node/InsertSender.java
===================================================================
--- trunk/freenet/src/freenet/node/InsertSender.java    2005-11-29 18:18:12 UTC 
(rev 7631)
+++ trunk/freenet/src/freenet/node/InsertSender.java    2005-11-29 19:39:41 UTC 
(rev 7632)
@@ -396,6 +396,7 @@

         for(Iterator i = blockSenders.iterator();i.hasNext();) {
                BlockTransmitter bt = (BlockTransmitter) i.next();
+               Logger.minor(this, "Waiting for "+bt);
                bt.waitForComplete();
                if(bt.failedDueToOverload() && (status == SUCCESS || status == 
ROUTE_NOT_FOUND)) {
                        forwardRejectedOverload();
@@ -409,6 +410,7 @@
         synchronized(this) {
             notifyAll();
         }
+        Logger.minor(this, "Returning from finish()");
     }

     public int getStatus() {

Modified: trunk/freenet/src/freenet/node/RequestSender.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestSender.java   2005-11-29 18:18:12 UTC 
(rev 7631)
+++ trunk/freenet/src/freenet/node/RequestSender.java   2005-11-29 19:39:41 UTC 
(rev 7632)
@@ -149,6 +149,7 @@

                 try {
                     msg = node.usm.waitFor(mf);
+                    Logger.minor(this, "first part got "+msg);
                 } catch (DisconnectedException e) {
                     Logger.normal(this, "Disconnected from "+next+" while 
waiting for Accepted on "+uid);
                     break;
@@ -218,6 +219,8 @@
                        continue;
                }

+                Logger.minor(this, "second part got "+msg);
+                
                if(msg == null) {
                        // Fatal timeout
                        next.localRejectedOverload();
@@ -237,7 +240,7 @@
                        short newHtl = msg.getShort(DMT.HTL);
                        if(newHtl < htl) htl = newHtl;
                        next.successNotOverload();
-                       continue;
+                       break;
                }

                if(msg.getSpec() == DMT.FNPRejectedOverload) {

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2005-11-29 18:18:12 UTC (rev 
7631)
+++ trunk/freenet/src/freenet/node/Version.java 2005-11-29 19:39:41 UTC (rev 
7632)
@@ -20,10 +20,10 @@
        public static final String protocolVersion = "1.0";

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

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

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