diff --git a/binding/java/pom.xml b/binding/java/pom.xml index 995b7283..21007457 100644 --- a/binding/java/pom.xml +++ b/binding/java/pom.xml @@ -4,7 +4,7 @@ org.lionsoul ip2region - 2.6.6 + 2.7.0 jar ip2region @@ -41,6 +41,8 @@ UTF-8 UTF-8 + 1.6 + 1.6 diff --git a/binding/java/src/main/java/org/lionsoul/ip2region/xdb/Searcher.java b/binding/java/src/main/java/org/lionsoul/ip2region/xdb/Searcher.java index 3f834c71..f441036d 100644 --- a/binding/java/src/main/java/org/lionsoul/ip2region/xdb/Searcher.java +++ b/binding/java/src/main/java/org/lionsoul/ip2region/xdb/Searcher.java @@ -235,8 +235,8 @@ public static int getInt(byte[] b, int offset) { public static int getInt2(byte[] b, int offset) { return ( - (b[offset++] & 0x000000FF) | - (b[offset ] & 0x0000FF00) + ((b[offset++] & 0x000000FF)) | + ((b[offset ] << 8) & 0x0000FF00) ); } diff --git a/maker/java/pom.xml b/maker/java/pom.xml index 1bf6653e..9ee9eacc 100644 --- a/maker/java/pom.xml +++ b/maker/java/pom.xml @@ -41,6 +41,8 @@ UTF-8 UTF-8 + 1.6 + 1.6 diff --git a/maker/java/src/main/java/org/lionsoul/ip2region/xdb/Util.java b/maker/java/src/main/java/org/lionsoul/ip2region/xdb/Util.java index 22329569..9905ddf2 100644 --- a/maker/java/src/main/java/org/lionsoul/ip2region/xdb/Util.java +++ b/maker/java/src/main/java/org/lionsoul/ip2region/xdb/Util.java @@ -36,8 +36,8 @@ public static long getIntLong(byte[] b, int offset) { public static int getInt2(byte[] b, int offset) { return ( - (b[offset++] & 0x000000FF) | - (b[offset ] & 0x0000FF00) + ((b[offset++]) & 0x000000FF) | + ((b[offset ] << 8) & 0x0000FF00) ); }