fix the bug of getInt2 reported by https://github.com/lionsoul2014/ip2region/issues/287
This commit is contained in:
parent
d0550cc81d
commit
767fad89e5
|
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
<groupId>org.lionsoul</groupId>
|
<groupId>org.lionsoul</groupId>
|
||||||
<artifactId>ip2region</artifactId>
|
<artifactId>ip2region</artifactId>
|
||||||
<version>2.6.6</version>
|
<version>2.7.0</version>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
<name>ip2region</name>
|
<name>ip2region</name>
|
||||||
|
|
@ -41,6 +41,8 @@
|
||||||
<properties>
|
<properties>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
<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>
|
</properties>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
|
|
||||||
|
|
@ -235,8 +235,8 @@ public class Searcher {
|
||||||
|
|
||||||
public static int getInt2(byte[] b, int offset) {
|
public static int getInt2(byte[] b, int offset) {
|
||||||
return (
|
return (
|
||||||
(b[offset++] & 0x000000FF) |
|
((b[offset++] & 0x000000FF)) |
|
||||||
(b[offset ] & 0x0000FF00)
|
((b[offset ] << 8) & 0x0000FF00)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -41,6 +41,8 @@
|
||||||
<properties>
|
<properties>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
<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>
|
</properties>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
|
|
||||||
|
|
@ -36,8 +36,8 @@ public class Util
|
||||||
|
|
||||||
public static int getInt2(byte[] b, int offset) {
|
public static int getInt2(byte[] b, int offset) {
|
||||||
return (
|
return (
|
||||||
(b[offset++] & 0x000000FF) |
|
((b[offset++]) & 0x000000FF) |
|
||||||
(b[offset ] & 0x0000FF00)
|
((b[offset ] << 8) & 0x0000FF00)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue