Changeset a2c867c

Timestamp:

Sep 24, 2011 9:45:52 PM (9 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

4822e47

Parents:

fd1c8c4

Message:

cleanups

Files:

• core/java/src/net/i2p/data/DataHelper.java (modified) (1 diff)
• router/java/src/net/i2p/router/networkdb/kademlia/XORComparator.java (modified) (2 diffs)

core/java/src/net/i2p/data/DataHelper.java

@@ -56 +56 @@
  */
 public class DataHelper {
-    private static final byte EQUAL_BYTES[];
-    private static final byte SEMICOLON_BYTES[];
-    static {
-        try {
-            EQUAL_BYTES = "=".getBytes("UTF-8");
-            SEMICOLON_BYTES = ";".getBytes("UTF-8");
-        } catch (UnsupportedEncodingException uee) {
-            throw new RuntimeException("no utf8!?");
-        }
-    }
+    private static final byte[] EQUAL_BYTES = getUTF8("=");
+    private static final byte[] SEMICOLON_BYTES = getUTF8(";");
 
     /** Read a mapping from the stream, as defined by the I2P data structure spec,

router/java/src/net/i2p/router/networkdb/kademlia/XORComparator.java

@@ -11 +11 @@
  */
 class XORComparator implements Comparator<Hash> {
-    private final Hash _base;
+    private final byte[] _base;
 
     /**
@@ -17 +17 @@
      */
     public XORComparator(Hash target) {
-        _base = target;
+        _base = target.getData();
     }
 
     public int compare(Hash lhs, Hash rhs) {
-        if (lhs == null) throw new NullPointerException("LHS is null");
-        if (rhs == null) throw new NullPointerException("RHS is null");
-        byte lhsDelta[] = DataHelper.xor(lhs.getData(), _base.getData());
-        byte rhsDelta[] = DataHelper.xor(rhs.getData(), _base.getData());
+        byte lhsDelta[] = DataHelper.xor(lhs.getData(), _base);
+        byte rhsDelta[] = DataHelper.xor(rhs.getData(), _base);
         return DataHelper.compareTo(lhsDelta, rhsDelta);
     }