Upstream
/
dynmap
mirror of https://github.com/webbukkit/dynmap.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/FrozenCow/dynmap

This commit is contained in:
Jason Booth 2011-02-09 14:24:13 -06:00
parent 2f6930bc17 29517e9a24
commit 959040e5f4
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/dynmap/kzedmap/ZoomedTileRenderer.java
View File

@ -29,7 +29,6 @@ public class ZoomedTileRenderer {
try {
image = ImageIO.read(new File(new File(outputPath), originalTile.getName() + ".png"));
} catch (IOException e) {
return;
}
if (image == null) {
@ -42,7 +41,6 @@ public class ZoomedTileRenderer {
try {
zIm = ImageIO.read(zoomFile);
} catch (IOException e) {
return;
}
if (zIm == null) {

5
src/main/java/org/dynmap/web/HttpServerConnection.java
View File

@ -29,7 +29,10 @@ public class HttpServerConnection extends Thread {
private static boolean readRequestHeader(InputStream in, HttpRequest request) throws IOException {
BufferedReader r = new BufferedReader(new InputStreamReader(in));
Matcher m = requestHeaderLine.matcher(r.readLine());
String statusLine = r.readLine();
if (statusLine == null)
return false;
Matcher m = requestHeaderLine.matcher(statusLine);
if (!m.matches())
return false;
request.method = m.group(1);