[freenet-cvs] r17274 - trunk/freenet/src/freenet/store

[t...@freenetproject.org]

Author: toad
Date: 2008-01-25 15:05:32 +0000 (Fri, 25 Jan 2008)
New Revision: 17274

Modified:
   trunk/freenet/src/freenet/store/CHKStore.java
   trunk/freenet/src/freenet/store/PubkeyStore.java
Log:
Prevent logging NPEs at DEBUG. Also, passing in the key as the full key makes 
sense.

Modified: trunk/freenet/src/freenet/store/CHKStore.java
===================================================================
--- trunk/freenet/src/freenet/store/CHKStore.java       2008-01-25 14:58:31 UTC 
(rev 17273)
+++ trunk/freenet/src/freenet/store/CHKStore.java       2008-01-25 15:05:32 UTC 
(rev 17274)
@@ -27,7 +27,7 @@
        public void put(CHKBlock b) throws IOException {
                NodeCHK key = (NodeCHK) b.getKey();
                try {
-                       store.put(b, key.getRoutingKey(), null, b.getRawData(), 
b.getRawHeaders(), false);
+                       store.put(b, key.getRoutingKey(), key.getRoutingKey(), 
b.getRawData(), b.getRawHeaders(), false);
                } catch (KeyCollisionException e) {
                        Logger.error(this, "Impossible for CHKStore: "+e, e);
                }

Modified: trunk/freenet/src/freenet/store/PubkeyStore.java
===================================================================
--- trunk/freenet/src/freenet/store/PubkeyStore.java    2008-01-25 14:58:31 UTC 
(rev 17273)
+++ trunk/freenet/src/freenet/store/PubkeyStore.java    2008-01-25 15:05:32 UTC 
(rev 17274)
@@ -32,7 +32,7 @@

        public void put(byte[] hash, DSAPublicKey key) throws IOException {
                try {
-                       store.put(key, key.getRoutingKey(), null, 
key.asPaddedBytes(), empty, false);
+                       store.put(key, key.getRoutingKey(), 
key.getRoutingKey(), key.asPaddedBytes(), empty, false);
                } catch (KeyCollisionException e) {
                        Logger.error(this, "Impossible for PubkeyStore: "+e, e);
                }