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

[t...@freenetproject.org]

Author: toad
Date: 2008-03-20 17:07:57 +0000 (Thu, 20 Mar 2008)
New Revision: 18650

Modified:
   trunk/freenet/src/freenet/node/RequestHandler.java
Log:
Delete createDataFound.

Modified: trunk/freenet/src/freenet/node/RequestHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestHandler.java  2008-03-20 17:06:30 UTC 
(rev 18649)
+++ trunk/freenet/src/freenet/node/RequestHandler.java  2008-03-20 17:07:57 UTC 
(rev 18650)
@@ -383,11 +383,11 @@
      * @throws NotConnectedException If we lose the connected to the request 
source.
      */
     private void returnLocalData(KeyBlock block) throws NotConnectedException {
-        Message df = createDataFound(block);
         if(key instanceof NodeSSK) {
                        sendSSK(block.getRawHeaders(), block.getRawData(), 
needsPubKey, ((SSKBlock)block).getPubKey());
             status = RequestSender.SUCCESS; // for byte logging
         } else if(block instanceof CHKBlock) {
+               Message df = DMT.createFNPCHKDataFound(uid, 
block.getRawHeaders());
                PartiallyReceivedBlock prb =
                        new PartiallyReceivedBlock(Node.PACKETS_IN_BLOCK, 
Node.PACKET_SIZE, block.getRawData());
                BlockTransmitter bt =
@@ -607,15 +607,6 @@
                }
        }

-       private Message createDataFound(KeyBlock block) {
-               if(block instanceof CHKBlock)
-                       return DMT.createFNPCHKDataFound(uid, 
block.getRawHeaders());
-               else if(block instanceof SSKBlock) {
-                       return DMT.createFNPSSKDataFound(uid, 
block.getRawHeaders(), block.getRawData());
-               } else
-                       throw new IllegalStateException("Unknown key block 
type: "+block.getClass());
-       }
-
        private int sentBytes;
        private int receivedBytes;
        private volatile Object bytesSync = new Object();