Author: toad
Date: 2008-03-19 16:08:17 +0000 (Wed, 19 Mar 2008)
New Revision: 18607
Modified:
trunk/freenet/src/freenet/node/RequestHandler.java
Log:
Simplify and fix NPE
Modified: trunk/freenet/src/freenet/node/RequestHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestHandler.java 2008-03-19 16:06:29 UTC
(rev 18606)
+++ trunk/freenet/src/freenet/node/RequestHandler.java 2008-03-19 16:08:17 UTC
(rev 18607)
@@ -383,7 +383,7 @@
private void returnLocalData(KeyBlock block) throws NotConnectedException {
Message df = createDataFound(block);
if(key instanceof NodeSSK) {
- sendSSK(uid, rs.getHeaders(), rs.getSSKData(),
needsPubKey, ((NodeSSK)rs.getSSKBlock().getKey()).getPubKey());
+ sendSSK(uid, block.getRawHeaders(), block.getRawData(),
needsPubKey, ((SSKBlock)block).getPubKey());
status = RequestSender.SUCCESS; // for byte logging
} else if(block instanceof CHKBlock) {
PartiallyReceivedBlock prb =
