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

fix NPE in LwHttp

Browse Source 
hopefully this fixes #27, check mResposeStream != null.
release references to streams when socket is closed()
This commit is contained in:
Hannes Janetzek 2014-01-28 00:31:52 +01:00
parent 9351380645
commit 3543b71671
1 changed files with 61 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
vtm/src/org/oscim/tiling/source/common/LwHttp.java
View File

@ -27,6 +27,7 @@ import java.net.URL;
import org.oscim.core.Tile; import org.oscim.core.Tile;
import org.oscim.utils.ArrayUtils; import org.oscim.utils.ArrayUtils;
import org.oscim.utils.IOUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -212,18 +213,6 @@ public class LwHttp {
} }
} }
public void close() {
if (mSocket != null) {
try {
mSocket.close();
} catch (IOException e) {
e.printStackTrace();
} finally {
mSocket = null;
}
}
}
public InputStream read() throws IOException { public InputStream read() throws IOException {
Buffer is = mResponseStream; Buffer is = mResponseStream;
@ -306,30 +295,21 @@ public class LwHttp {
public boolean sendRequest(UrlTileSource tileSource, Tile tile) throws IOException { public boolean sendRequest(UrlTileSource tileSource, Tile tile) throws IOException {
if (mSocket != null && ((mMaxReq-- <= 0) if (mSocket != null) {
|| (System.nanoTime() - mLastRequest > RESPONSE_TIMEOUT))) { if (mMaxReq-- <= 0)
close();
else if (System.nanoTime() - mLastRequest > RESPONSE_TIMEOUT)
close();
else if (mResponseStream.available() > 0)
close(); close();
if (dbg)
log.debug("not alive - recreate connection " + mMaxReq);
} }
if (mSocket == null) { if (mSocket == null) {
// might throw IOException
lwHttpConnect(); lwHttpConnect();
// we know our server
// TODO parse from header
mMaxReq = RESPONSE_EXPECTED_LIVES; mMaxReq = RESPONSE_EXPECTED_LIVES;
// log.debug("create connection");
} else {
int avail = mResponseStream.available();
if (avail > 0) {
log.debug("left-over bytes: " + avail);
close();
lwHttpConnect();
// FIXME not sure if this is correct way to drain socket
//while ((avail = mResponseStream.available()) > 0)
// mResponseStream.read(buffer);
}
} }
byte[] request = mRequestBuffer; byte[] request = mRequestBuffer;
@ -350,12 +330,13 @@ public class LwHttp {
return true; return true;
} catch (IOException e) { } catch (IOException e) {
log.debug("recreate connection"); log.debug("recreate connection");
} close();
// might throw IOException
lwHttpConnect(); lwHttpConnect();
mCommandStream.write(request, 0, len); mCommandStream.write(request, 0, len);
mCommandStream.flush(); mCommandStream.flush();
}
return true; return true;
} }
@ -364,13 +345,52 @@ public class LwHttp {
if (mSockAddr == null) if (mSockAddr == null)
mSockAddr = new InetSocketAddress(mHost, mPort); mSockAddr = new InetSocketAddress(mHost, mPort);
try {
mSocket = new Socket(); mSocket = new Socket();
mSocket.connect(mSockAddr, 30000); mSocket.connect(mSockAddr, 30000);
mSocket.setTcpNoDelay(true); mSocket.setTcpNoDelay(true);
mCommandStream = mSocket.getOutputStream(); mCommandStream = mSocket.getOutputStream();
mResponseStream = new Buffer(mSocket.getInputStream()); mResponseStream = new Buffer(mSocket.getInputStream());
} catch (IOException e) {
close();
throw e;
}
return true;
}
public void close() {
if (mSocket == null)
return;
IOUtils.closeQuietly(mSocket);
mSocket = null;
mCommandStream = null;
mResponseStream = null;
}
public void setCache(OutputStream os) {
if (mResponseStream == null)
return;
mResponseStream.setCache(os);
}
public boolean requestCompleted(boolean success) {
if (mResponseStream == null)
return false;
mLastRequest = System.nanoTime();
mResponseStream.setCache(null);
if (!mResponseStream.finishedReading()) {
log.debug("invalid buffer position");
close();
return false;
}
if (!success) {
close();
return false;
}
return true; return true;
} }
@ -413,26 +433,4 @@ public class LwHttp {
return true; return true;
} }
public void setCache(OutputStream os) {
mResponseStream.setCache(os);
}
public boolean requestCompleted(boolean success) {
mLastRequest = System.nanoTime();
mResponseStream.setCache(null);
if (!mResponseStream.finishedReading()) {
log.debug("invalid buffer position");
close();
return false;
}
if (!success) {
close();
return false;
}
return true;
}
} }