Change Reader.readNode to return long instead of int

Author: silvanocerza

src/main/java/com/maxmind/db/Decoder.java

@@ -202,9 +202,13 @@ private int decodeInt32(int size) {
     }
 
     private long decodeLong(int size) {
-        long integer = 0;
+        return Decoder.decodeLong(this.buffer, 0, size);
+    }
+
+    static long decodeLong(Buffer buffer, int base, int size) {
+        long integer = base;
         for (int i = 0; i < size; i++) {
-            integer = (integer << 8) | (this.buffer.get() & 0xFF);
+            integer = (integer << 8) | (buffer.get() & 0xFF);
         }
         return integer;
     }

src/main/java/com/maxmind/db/Networks.java

@@ -154,7 +154,7 @@ public boolean hasNext()  {
                 ipRight[node.prefix >> 3] |= 1 << (7 - (node.prefix % 8));
 
                 try {
-                    int rightPointer = this.reader.readNode(this.buffer, node.pointer, 1);
+                    long rightPointer = this.reader.readNode(this.buffer, node.pointer, 1);
                     node.prefix++;
 
                     this.nodes.push(new NetworkNode(ipRight, node.prefix, rightPointer));

src/main/java/com/maxmind/db/Reader.java

@@ -355,7 +355,7 @@ record = this.readNode(buffer, record, bit);
         return new long[]{record, i};
     }
 
-    int readNode(Buffer buffer, long nodeNumber, int index)
+    long readNode(Buffer buffer, long nodeNumber, int index)
             throws InvalidDatabaseException {
         // index is the index of the record within the node, which
         // can either be 0 or 1.
@@ -365,7 +365,7 @@ int readNode(Buffer buffer, long nodeNumber, int index)
             case 24:
                 // For a 24 bit record, each record is 3 bytes.
                 buffer.position(baseOffset + (long) index * 3);
-                return Decoder.decodeInteger(buffer, 0, 3);
+                return Decoder.decodeLong(buffer, 0, 3);
             case 28:
                 int middle = buffer.get(baseOffset + 3);
 
@@ -378,10 +378,10 @@ int readNode(Buffer buffer, long nodeNumber, int index)
                     middle = 0x0F & middle;
                 }
                 buffer.position(baseOffset + (long) index * 4);
-                return Decoder.decodeInteger(buffer, middle, 3);
+                return Decoder.decodeLong(buffer, middle, 3);
             case 32:
                 buffer.position(baseOffset + (long) index * 4);
-                return Decoder.decodeInteger(buffer, 0, 4);
+                return Decoder.decodeLong(buffer, 0, 4);
             default:
                 throw new InvalidDatabaseException("Unknown record size: "
                     + this.metadata.getRecordSize());