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

[toad at freenetproject.org]

Author: toad
Date: 2007-08-09 10:14:51 +0000 (Thu, 09 Aug 2007)
New Revision: 14555

Modified:
   trunk/freenet/src/freenet/node/RequestHandler.java
Log:
Re-enable request bytes logging. Was broken by refactoring in 14087. This may account for the recent problems with bandwidth usage/load...

Modified: trunk/freenet/src/freenet/node/RequestHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestHandler.java	2007-08-09 09:59:27 UTC (rev 14554)
+++ trunk/freenet/src/freenet/node/RequestHandler.java	2007-08-09 10:14:51 UTC (rev 14555)
@@ -42,6 +42,8 @@
     final Key key;
     private boolean finalTransferFailed = false;
     final boolean resetClosestLoc;
+    /** The RequestSender, if any */
+    private RequestSender rs;
     
     public String toString() {
         return super.toString()+" for "+uid;
@@ -74,7 +76,7 @@
     	RequestSender rs = null;
     	boolean thrown = false;
         try {
-        	realRun(rs, status);
+        	realRun(status);
         } catch (NotConnectedException e) {
         	// Ignore, normal
         } catch (Throwable t) {
@@ -116,7 +118,7 @@
         }
     }
 
-    private void realRun(RequestSender rs, int status) throws NotConnectedException {
+    private void realRun(int status) throws NotConnectedException {
         if(logMINOR) Logger.minor(this, "Handling a request: "+uid);
         if(!resetClosestLoc)
         	htl = source.decrementHTL(htl);
@@ -186,7 +188,7 @@
             		finalTransferFailed = true;
             	} else {
     				// Successful CHK transfer, maybe path fold
-    				finishOpennet(rs);
+    				finishOpennet();
             	}
         	    return;
             }
@@ -259,7 +261,7 @@
         }
 	}
 
-	private void finishOpennet(RequestSender rs) {
+	private void finishOpennet() {
 		if(!(node.passOpennetRefsThroughDarknet() || source.isOpennet())) return;
 		byte[] noderef = rs.waitForOpennetNoderef();
 		if(noderef == null) {
@@ -272,7 +274,7 @@
 			return;
 		}
 		
-    	finishOpennetRelay(rs, noderef);
+    	finishOpennetRelay(noderef);
     }
     
     private void finishOpennetNoRelay() {
@@ -345,7 +347,7 @@
 		}
     }
     
-	private void finishOpennetRelay(RequestSender rs, byte[] noderef) {
+	private void finishOpennetRelay(byte[] noderef) {
     	if(logMINOR)
     		Logger.minor(this, "Finishing opennet: relaying reference from "+rs.successFrom());
 		// Send it back to the handler, then wait for the ConnectReply