Merge pull request #35 from chzyer/feature/v6

fix bugs and close idle connections

Author: longbai

src/com/qiniu/auth/Client.java

@@ -22,6 +22,7 @@
 import org.apache.http.util.EntityUtils;
 
 import java.io.IOException;
+import java.util.concurrent.TimeUnit;
 
 public class Client {
 
@@ -90,22 +91,16 @@ protected Object doInBackground(Object... objects) {
 			try {
 				HttpResponse resp = roundtrip(mHttpRequest);
 				int statusCode = resp.getStatusLine().getStatusCode();
-				if (statusCode == 401) { // android 2.3 will not response
-					return new Exception("unauthorized!");
-				}
-				byte[] data = EntityUtils.toByteArray(resp.getEntity());
+				String xl = resp.getFirstHeader("X-Log").getValue();
+
+				if (statusCode == 401) return new Exception("unauthorized!"); // android 2.3 will not response
+				if (xl.contains("invalid BlockCtx")) return new Exception(xl);
 
-				if (statusCode / 100 != 2) {
-					if (data.length == 0) {
-						String xlog = resp.getFirstHeader("X-Log").getValue();
-						if (xlog.length() > 0) {
-							return new Exception(xlog);
-						}
-						return new Exception(resp.getStatusLine().getReasonPhrase());
-					}
-					return new Exception(new String(data));
-				}
-				return data;
+				byte[] data = EntityUtils.toByteArray(resp.getEntity());
+				if (statusCode / 100 == 2) return data;
+				if (data.length > 0) return new Exception(new String(data));
+				if (xl.length() > 0) return new Exception(xl);
+				return new Exception(resp.getStatusLine().getStatusCode() + ":" + resp.getStatusLine().getReasonPhrase());
 			} catch (IOException e) {
 				e.printStackTrace();
 				return e;
@@ -119,6 +114,7 @@ protected void onProgressUpdate(Object... values) {
 
 		@Override
 		protected void onPostExecute(Object o) {
+			mClient.getConnectionManager().closeIdleConnections(30, TimeUnit.SECONDS);
 			if (o instanceof Exception) {
 				mRet.onFailure((Exception) o);
 				return;

src/com/qiniu/io/IO.java

@@ -12,6 +12,7 @@
 import org.json.JSONObject;
 
 import java.io.File;
+import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.Map;
@@ -44,9 +45,18 @@ private static Client defaultClient() {
 	public void put(String key, InputStreamAt isa, PutExtra extra, JSONObjectRet ret) {
 		MultipartEntity m = new MultipartEntity();
 		if (key != null) m.addField("key", key);
-		if (extra.checkCrc == PutExtra.AUTO_CRC32) extra.crc32 = isa.crc32();
+		if (extra.checkCrc == PutExtra.AUTO_CRC32) {
+			try {
+				extra.crc32 = isa.crc32();
+			} catch (IOException e) {
+				ret.onFailure(e);
+				return;
+			}
+		}
 		if (extra.checkCrc != PutExtra.UNUSE_CRC32) m.addField("crc32", extra.crc32 + "");
-		for (Map.Entry<String, String> i: extra.params.entrySet()) m.addField(i.getKey(), i.getValue());
+		for (Map.Entry<String, String> i: extra.params.entrySet()) {
+			m.addField(i.getKey(), i.getValue());
+		}
 
 		m.addField("token", mUptoken);
 		m.addFile("file", extra.mimeType, key == null ? "?" : key, isa);

src/com/qiniu/resumableio/ResumableClient.java

@@ -47,14 +47,24 @@ public void onInit(int flag) {
 
 			public void putInit() {
 				int chunkSize = Math.min(writeNeed, CHUNK_SIZE);
-				crc32 = input.getCrc32(offset, chunkSize);
+				try {
+					crc32 = input.getCrc32(offset, chunkSize);
+				} catch (IOException e) {
+					onFailure(e);
+					return;
+				}
 				canceler[0] = mkblk(input, offset, writeNeed, chunkSize, this);
 			}
 
 			public void putNext() {
 				wrote = putRet.offset;
 				int remainLength = Math.min((int) (input.length() - offset - putRet.offset), CHUNK_SIZE);
-				crc32 = input.getCrc32(offset+putRet.offset, remainLength);
+				try {
+					crc32 = input.getCrc32(offset+putRet.offset, remainLength);
+				} catch (IOException e) {
+					onFailure(e);
+					return;
+				}
 				canceler[0] = bput(putRet.host, input, putRet.ctx, offset, putRet.offset, remainLength, this);
 			}
 

src/com/qiniu/resumableio/ResumableIO.java

@@ -36,7 +36,7 @@ private synchronized void removeTask(Integer id) {
 		idCancels.remove(id);
 	}
 
-	public int putAndClose(final String key, final InputStreamAt input, final PutExtra extra, final JSONObjectRet ret) {
+	private int putAndClose(final String key, final InputStreamAt input, final PutExtra extra, final JSONObjectRet ret) {
 		return put(key, input, extra, new JSONObjectRet() {
 			@Override
 			public void onSuccess(JSONObject obj) {
@@ -121,6 +121,10 @@ public void onProcess(long current, long total) {
 
 				@Override
 				public void onFailure(Exception ex) {
+					if (failure[0]) {
+						ex.printStackTrace();
+						return;
+					}
 					if (--retryTime <= 0 || (ex.getMessage() != null && ex.getMessage().contains("Unauthorized"))) {
 						removeTask(taskId);
 						failure[0] = true;

src/com/qiniu/utils/InputStreamAt.java

@@ -58,14 +58,14 @@ public InputStreamAt(byte[] data) {
 		mData = data;
 	}
 
-	public long getCrc32(long offset, int length) {
+	public long getCrc32(long offset, int length) throws IOException {
 		CRC32 crc32 = new CRC32();
 		byte[] data = read(offset, length);
 		crc32.update(data);
 		return crc32.getValue();
 	}
 
-	public long crc32() {
+	public long crc32() throws IOException {
 		if (mCrc32 >= 0) return mCrc32;
 		CRC32 crc32 = new CRC32();
 		long index = 0;
@@ -120,34 +120,31 @@ protected static File storeToFile(Context context, InputStream is) {
 		}
 	}
 
-	public byte[] read(long offset, int length) {
-		if (mClosed) return null;
-		try {
-			if (mFileStream != null) {
-				return fileStreamRead(offset, length);
-			}
-			if (mData != null) {
-				byte[] ret = new byte[length];
-				System.arraycopy(mData, (int) offset, ret, 0, length);
-				return ret;
-			}
-		} catch (IOException e) {
-			e.printStackTrace();
+	public byte[] read(long offset, int length) throws IOException {
+		if (mClosed) throw new IOException("inputStreamAt closed");
+		if (mFileStream != null) {
+			return fileStreamRead(offset, length);
 		}
-
-		return null;
+		if (mData != null) {
+			byte[] ret = new byte[length];
+			System.arraycopy(mData, (int) offset, ret, 0, length);
+			return ret;
+		}
+		throw new IOException("inputStreamAt not init");
 	}
 
 	protected byte[] fileStreamRead(long offset, int length) throws IOException {
 		if (mFileStream == null) return null;
+		long fileLength = mFileStream.length();
+		if (length + offset > fileLength) length = (int) (fileLength - offset);
 		byte[] data = new byte[length];
 
 		int read;
 		int totalRead = 0;
 		synchronized (data) {
 			mFileStream.seek(offset);
 			do {
-				read = mFileStream.read(data, totalRead, length);
+				read = mFileStream.read(data, totalRead, length - totalRead);
 				if (read <= 0) break;
 				totalRead += read;
 			} while (length > totalRead);