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

[t...@freenetproject.org]

Author: toad
Date: 2008-02-27 17:16:36 +0000 (Wed, 27 Feb 2008)
New Revision: 18181

Modified:
   trunk/freenet/src/freenet/node/RequestHandler.java
Log:
Doh - fix NPE, report in returnLocalData for local return of data for SSKs

Modified: trunk/freenet/src/freenet/node/RequestHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestHandler.java  2008-02-27 16:58:51 UTC 
(rev 18180)
+++ trunk/freenet/src/freenet/node/RequestHandler.java  2008-02-27 17:16:36 UTC 
(rev 18181)
@@ -123,10 +123,6 @@
                                
node.nodeStats.successfulChkFetchBytesReceivedAverage.report(rcvd);
                        }
                }
-        } else if(status == RequestSender.SUCCESS && key instanceof NodeSSK) {
-               // Sent from datastore.
-            node.sentPayload(rs.getSSKData().length); // won't be 
sentPayload()ed by BlockTransmitter
-            sentPayload(rs.getSSKData().length);
         }
     }

@@ -348,6 +344,9 @@
                sendTerminal(df);
             }
             status = RequestSender.SUCCESS; // for byte logging
+               // Sent from datastore.
+            node.sentPayload(rs.getSSKData().length); // won't be 
sentPayload()ed by BlockTransmitter
+            sentPayload(rs.getSSKData().length);
         } else if(block instanceof CHKBlock) {
                PartiallyReceivedBlock prb =
                        new PartiallyReceivedBlock(Node.PACKETS_IN_BLOCK, 
Node.PACKET_SIZE, block.getRawData());