xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

reset connection on transmission error

Browse Source
This commit is contained in:
Hannes Janetzek 2012-11-25 21:10:47 +01:00
parent 31f1ad661c
commit e666eb6a82
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/org/oscim/database/oscimap/MapDatabase.java
View File

@ -114,16 +114,16 @@ public class MapDatabase implements IMapDatabase {
try { try {
if (lwHttpSendRequest(tile)) { if (lwHttpSendRequest(tile) && lwHttpReadHeader() >= 0) {
if (lwHttpReadHeader() >= 0) { cacheBegin(tile, f);
decode();
cacheBegin(tile, f);
decode();
}
} else { } else {
Log.d(TAG, "Network Error: " + tile);
result = QueryResult.FAILED; result = QueryResult.FAILED;
// clear connection, TODO cleanup properly
mSocket.close();
mSocket = null;
} }
} catch (SocketException ex) { } catch (SocketException ex) {
Log.d(TAG, "Socket exception: " + ex.getMessage()); Log.d(TAG, "Socket exception: " + ex.getMessage());
result = QueryResult.FAILED; result = QueryResult.FAILED;
@ -215,8 +215,6 @@ public class MapDatabase implements IMapDatabase {
} }
// /////////////// hand sewed tile protocol buffers decoder /////////////// // /////////////// hand sewed tile protocol buffers decoder ///////////////
// TODO write an own serialization format for structs and packed strings..
private static final int BUFFER_SIZE = 65536; private static final int BUFFER_SIZE = 65536;
private final byte[] mReadBuffer = new byte[BUFFER_SIZE]; private final byte[] mReadBuffer = new byte[BUFFER_SIZE];
@ -745,7 +743,6 @@ public class MapDatabase implements IMapDatabase {
} }
// ///////////////////////// Lightweight HttpClient /////////////////////// // ///////////////////////// Lightweight HttpClient ///////////////////////
// should have written simple tcp server/client for this...
private int mMaxReq = 0; private int mMaxReq = 0;
private Socket mSocket; private Socket mSocket;
@ -788,9 +785,6 @@ public class MapDatabase implements IMapDatabase {
if (!compareBytes(buf, pos, end, RESPONSE_HTTP_OK, 15)) if (!compareBytes(buf, pos, end, RESPONSE_HTTP_OK, 15))
return -1; return -1;
// for (int i = 0; i < 15 && pos + i < end; i++)
// if (buf[pos + i] != RESPONSE_HTTP_OK[i])
} else if (end - pos == 1) { } else if (end - pos == 1) {
// check empty line (header end) // check empty line (header end)
end += 1; end += 1;