fix the bug of getInt2 reported by #287

lionsoul2014 · Feb 5, 2023 · 767fad8 · 767fad8
1 parent d0550cc
commit 767fad8
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/binding/java/pom.xml b/binding/java/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>org.lionsoul</groupId>
     <artifactId>ip2region</artifactId>
-    <version>2.6.6</version>
+    <version>2.7.0</version>
     <packaging>jar</packaging>
 
     <name>ip2region</name>
@@ -41,6 +41,8 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <maven.compiler.source>1.6</maven.compiler.source>
+        <maven.compiler.target>1.6</maven.compiler.target>
     </properties>
 
     <dependencies>

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
@@ -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
@@ -41,6 +41,8 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <maven.compiler.source>1.6</maven.compiler.source>
+        <maven.compiler.target>1.6</maven.compiler.target>
     </properties>
 
     <dependencies>

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
@@ -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)
         );
     }