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

[t...@freenetproject.org]

Author: toad
Date: 2005-11-18 21:31:20 +0000 (Fri, 18 Nov 2005)
New Revision: 7567

Modified:
   trunk/freenet/src/freenet/node/NodeDispatcher.java
   trunk/freenet/src/freenet/node/RequestHandler.java
   trunk/freenet/src/freenet/node/Version.java
Log:
196:
Fix wierd bug that was causing RejectOverload's (we were RejectLoop'ing and 
then processing the request anyway!).
And another one.

Modified: trunk/freenet/src/freenet/node/NodeDispatcher.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeDispatcher.java  2005-11-18 20:55:59 UTC 
(rev 7566)
+++ trunk/freenet/src/freenet/node/NodeDispatcher.java  2005-11-18 21:31:20 UTC 
(rev 7567)
@@ -88,10 +88,21 @@
             try {
                 ((PeerNode)(m.getSource())).sendAsync(rejected, null);
             } catch (NotConnectedException e) {
+                Logger.normal(this, "Rejecting data request (loop, finished): 
"+e);
+            }
+            return true;
+        }
+        if(!node.lockUID(id)) {
+            Logger.minor(this, "Could not lock ID "+id+" -> rejecting (already 
running)");
+            Message rejected = DMT.createFNPRejectedLoop(id);
+            try {
+                ((PeerNode)(m.getSource())).sendAsync(rejected, null);
+            } catch (NotConnectedException e) {
                 Logger.normal(this, "Rejecting insert request: "+e);
             }
+            return true;
         }
-        if(!node.lockUID(id)) return false;
+        //if(!node.lockUID(id)) return false;
         RequestHandler rh = new RequestHandler(m, id, node);
         Thread t = new Thread(rh);
         t.setDaemon(true);

Modified: trunk/freenet/src/freenet/node/RequestHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestHandler.java  2005-11-18 20:55:59 UTC 
(rev 7566)
+++ trunk/freenet/src/freenet/node/RequestHandler.java  2005-11-18 21:31:20 UTC 
(rev 7567)
@@ -44,6 +44,7 @@

     public void run() {
         try {
+        Logger.minor(this, "Handling a request: "+uid);
         htl = source.decrementHTL(htl);

         Message accepted = DMT.createFNPAccepted(uid);

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2005-11-18 20:55:59 UTC (rev 
7566)
+++ trunk/freenet/src/freenet/node/Version.java 2005-11-18 21:31:20 UTC (rev 
7567)
@@ -20,10 +20,10 @@
        public static final String protocolVersion = "1.0";

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

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

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