[freenet-cvs] r20026 - branches/saltedhashstore/freenet/src/freenet/store

[j16s...@freenetproject.org]

Author: j16sdiz
Date: 2008-05-22 10:24:30 +0000 (Thu, 22 May 2008)
New Revision: 20026

Modified:
   
branches/saltedhashstore/freenet/src/freenet/store/SaltedHashFreenetStore.java
Log:
use Fields.bytesToLong()


Modified: 
branches/saltedhashstore/freenet/src/freenet/store/SaltedHashFreenetStore.java
===================================================================
--- 
branches/saltedhashstore/freenet/src/freenet/store/SaltedHashFreenetStore.java  
    2008-05-22 10:21:02 UTC (rev 20025)
+++ 
branches/saltedhashstore/freenet/src/freenet/store/SaltedHashFreenetStore.java  
    2008-05-22 10:24:30 UTC (rev 20026)
@@ -23,6 +23,7 @@
 import freenet.crypt.ciphers.Rijndael;
 import freenet.keys.KeyVerifyException;
 import freenet.node.SemiOrderedShutdownHook;
+import freenet.support.Fields;
 import freenet.support.HexUtil;
 import freenet.support.Logger;
 import freenet.support.io.FileUtil;
@@ -1310,7 +1311,7 @@
         * @return
         */
        public long[] getOffsetFromDigestedKey(byte[] digestedKey, long 
storeSize) {
-               long keyValue = keyToLong(digestedKey);
+               long keyValue = Fields.bytesToLong(digestedKey);
                long[] offsets = new long[OPTION_MAX_PROBE];

                for (int i = 0 ; i < OPTION_MAX_PROBE ; i++) {
@@ -1321,17 +1322,6 @@
                return offsets;
        }

-       private long keyToLong(byte[] key) {
-               return (((long) (key[0]) << 0) + //
-                       (((long) key[1]) << 8) + //
-                       (((long) key[2]) << 16) + //
-                       (((long) key[3]) << 24) + //
-                       (((long) key[4]) << 32) + //
-                       (((long) key[5]) << 40) + //
-                               (((long) key[6]) << 48) + //
-                               (((long) key[7]) << 56));
-       }
-
        // ------------- Statistics (a.k.a. lies)
        private final Object statLock = new Object();
        private long hits;