fixed compile

Author: longbai

build.gradle

@@ -2,8 +2,8 @@ import java.util.regex.Matcher
 
 apply plugin: 'java'
 
-sourceCompatibility = 1.5
-targetCompatibility = 1.5
+sourceCompatibility = 1.6
+targetCompatibility = 1.6
 version = '1.0'
 [compileJava,compileTestJava,javadoc]*.options*.encoding = 'UTF-8'
 

src/main/java/qiniu/ip17mon/Locator.java

@@ -1,16 +1,13 @@
 package qiniu.ip17mon;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.nio.charset.Charset;
 import java.util.InputMismatchException;
 
 public final class Locator implements ILocator {
-    public static final String VERSION = "0.1.1";
+    public static final String VERSION = "0.1.2";
     private static final Charset Utf8 = Charset.forName("UTF-8");
     private final byte[] ipData;
     private final int textOffset;
@@ -154,29 +151,20 @@ public static Locator loadFromLocal(String filePath) throws IOException {
 
         return loadBinary(b);
     }
-    
-    public static Locator loadFromHDFS(String dfsPath) throws Exception {
-        Configuration conf = new Configuration();
-        FileSystem fs = FileSystem.get(conf);
 
+    public static Locator loadFromStream(InputStream in) throws Exception {
         ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+        byte[] buffer = new byte[16 * 1024];
+        while (in.read(buffer) != -1) {
+            byteArrayOutputStream.write(buffer);
+        }
 
-        Path filePath = new Path(dfsPath);
-
-        if(fs.exists(filePath)){
-            FSDataInputStream in = fs.open(filePath);
-            byte[] buffer = new byte[1];
+        int n = 0;
 
-            while (in.read(buffer) != -1){
-                byteArrayOutputStream.write(buffer);
-            }
-        } else {
-            throw new Exception("File does not exists!");
+        while ((n = in.read(buffer)) != -1) {
+            byteArrayOutputStream.write(buffer, 0, n);
         }
 
-        // Using in Spark, don't close it.
-        //fs.close();
-
         return loadBinary(byteArrayOutputStream.toByteArray());
     }
 
@@ -260,7 +248,7 @@ public void checkDb() throws IOException {
                 find(addr);
             }
         } catch (Exception e) {
-            throw new IOException(e);
+            throw new IOException(e.getMessage());
         }
     }
 }