Author: toad
Date: 2008-03-19 16:41:06 +0000 (Wed, 19 Mar 2008)
New Revision: 18613
Modified:
trunk/freenet/src/freenet/node/NodeDispatcher.java
trunk/freenet/src/freenet/node/SSKInsertHandler.java
Log:
Don't pass msg in at all
Modified: trunk/freenet/src/freenet/node/NodeDispatcher.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeDispatcher.java 2008-03-19 16:40:07 UTC
(rev 18612)
+++ trunk/freenet/src/freenet/node/NodeDispatcher.java 2008-03-19 16:41:06 UTC
(rev 18613)
@@ -393,7 +393,8 @@
byte[] data = ((ShortBuffer) m.getObject(DMT.DATA)).getData();
byte[] headers = ((ShortBuffer)
m.getObject(DMT.BLOCK_HEADERS)).getData();
short htl = m.getShort(DMT.HTL);
- SSKInsertHandler rh = new SSKInsertHandler(m, key,
data, headers, htl, source, id, node, now);
+ SSKInsertHandler rh = new SSKInsertHandler(key, data,
headers, htl, source, id, node, now);
+ rh.receivedBytes(m.receivedByteCount());
node.executor.execute(rh, "SSKInsertHandler for "+id+"
on "+node.getDarknetPortNumber());
} else {
CHKInsertHandler rh = new CHKInsertHandler(m, source,
id, node, now);
Modified: trunk/freenet/src/freenet/node/SSKInsertHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/SSKInsertHandler.java 2008-03-19
16:40:07 UTC (rev 18612)
+++ trunk/freenet/src/freenet/node/SSKInsertHandler.java 2008-03-19
16:41:06 UTC (rev 18613)
@@ -30,7 +30,6 @@
static final int PUBKEY_TIMEOUT = 10000;
- final Message req;
final Node node;
final long uid;
final PeerNode source;
@@ -44,8 +43,7 @@
private byte[] headers;
private boolean canCommit;
- SSKInsertHandler(Message req, NodeSSK key, byte[] data, byte[] headers,
short htl, PeerNode source, long id, Node node, long startTime) {
- this.req = req;
+ SSKInsertHandler(NodeSSK key, byte[] data, byte[] headers, short htl,
PeerNode source, long id, Node node, long startTime) {
this.node = node;
this.uid = id;
this.source = source;
@@ -57,7 +55,6 @@
pubKey = node.getKey(pubKeyHash);
canCommit = false;
logMINOR = Logger.shouldLog(Logger.MINOR, this);
- receivedBytes(req.receivedByteCount());
}
public String toString() {
