From 3fef2a2fadb0284364b4c30387a730c562a62f9f Mon Sep 17 00:00:00 2001
From: lion <chenxin619315@gmail.com>
Date: Sun, 5 Feb 2023 18:52:40 +0800
Subject: [PATCH] fix the bug of getInt2 reported by
 https://github.com/lionsoul2014/ip2region/issues/287

---
 binding/java/pom.xml                                          | 4 +++-
 .../src/main/java/org/lionsoul/ip2region/xdb/Searcher.java    | 4 ++--
 maker/java/pom.xml                                            | 2 ++
 maker/java/src/main/java/org/lionsoul/ip2region/xdb/Util.java | 4 ++--
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/binding/java/pom.xml b/binding/java/pom.xml
index 995b728..2100745 100644
--- 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
index 3f834c7..f441036 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 class Searcher {
 
     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 1bf6653..9ee9eac 100644
--- 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
index 2232956..9905ddf 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 class Util
 
     public static int getInt2(byte[] b, int offset) {
         return (
-            (b[offset++] & 0x000000FF) |
-            (b[offset  ] & 0x0000FF00)
+            ((b[offset++]) & 0x000000FF) |
+            ((b[offset  ] << 8) & 0x0000FF00)
         );
     }