Merge remote-tracking branch 'alron/master'

This commit is contained in:
FrozenCow 2011-03-15 16:53:12 +01:00
commit 437e82387b
4 changed files with 23 additions and 11 deletions

View file

@ -14,7 +14,7 @@ import org.dynmap.ColorScheme;
import org.dynmap.debug.Debug;
public class DefaultTileRenderer implements MapTileRenderer {
protected static Color translucent = new Color(0, 0, 0, 0);
protected static final Color translucent = new Color(0, 0, 0, 0);
private String name;
protected int maximumHeight = 127;
private ColorScheme colorScheme;

View file

@ -32,8 +32,15 @@ public class ClientConfigurationHandler implements HttpHandler {
response.fields.put("Content-Length", Integer.toString(cachedConfiguration.length));
response.status = HttpStatus.OK;
BufferedOutputStream out = new BufferedOutputStream(response.getBody());
out.write(cachedConfiguration);
out.flush();
BufferedOutputStream out = null;
try {
out = new BufferedOutputStream(response.getBody());
out.write(cachedConfiguration);
out.flush();
}
finally
{
out.close();
}
}
}

View file

@ -87,8 +87,15 @@ public class ClientUpdateHandler implements HttpHandler {
response.fields.put(HttpField.ContentLength, Integer.toString(bytes.length));
response.status = HttpStatus.OK;
BufferedOutputStream out = new BufferedOutputStream(response.getBody());
out.write(bytes);
out.flush();
BufferedOutputStream out = null;
try {
out = new BufferedOutputStream(response.getBody());
out.write(bytes);
out.flush();
}
finally
{
out.close();
}
}
}