Author: toad
Date: 2009-04-02 21:31:17 +0000 (Thu, 02 Apr 2009)
New Revision: 26387
Modified:
trunk/freenet/src/freenet/client/async/ClientRequestSchedulerBase.java
Log:
Don't look on wrong scheduler, slightly simplification
Modified: trunk/freenet/src/freenet/client/async/ClientRequestSchedulerBase.java
===================================================================
--- trunk/freenet/src/freenet/client/async/ClientRequestSchedulerBase.java
2009-04-02 21:22:37 UTC (rev 26386)
+++ trunk/freenet/src/freenet/client/async/ClientRequestSchedulerBase.java
2009-04-02 21:31:17 UTC (rev 26387)
@@ -313,8 +313,9 @@
public boolean tripPendingKey(Key key, KeyBlock block, ObjectContainer
container, ClientContext context) {
if((key instanceof NodeSSK) != isSSKScheduler) {
Logger.error(this, "Key "+key+" on scheduler
ssk="+isSSKScheduler, new Exception("debug"));
+ return false;
}
- byte[] saltedKey = ((key instanceof NodeSSK) ?
context.getSskFetchScheduler() : context.getChkFetchScheduler()).saltKey(key);
+ byte[] saltedKey = sched.saltKey(key);
ArrayList<KeyListener> matches = null;
synchronized(this) {
for(KeyListener listener : keyListeners) {
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
