Better exception handling.

src/main/java/org/dynmap/MapManager.java

@@ -79,6 +79,7 @@ public class MapManager extends Thread {
     }
 
     void renderFullWorld(Location l) {
+        synchronized (lock) {
             debugger.debug("Full render starting...");
             for (MapType map : maps) {
                 HashSet<MapTile> found = new HashSet<MapTile>();
@@ -135,6 +136,7 @@ public class MapManager extends Thread {
             }
             debugger.debug("Full render finished.");
         }
+    }
 
     private MapType[] loadMapTypes(ConfigurationNode configuration) {
         List<?> configuredMaps = (List<?>) configuration.getProperty("maps");

src/main/java/org/dynmap/web/HttpHandler.java

@@ -1,7 +1,6 @@
 package org.dynmap.web;
 
-import java.io.IOException;
 
 public interface HttpHandler {
-    void handle(String path, HttpRequest request, HttpResponse response) throws IOException;
+    void handle(String path, HttpRequest request, HttpResponse response) throws Exception;
 }

src/main/java/org/dynmap/web/HttpServerConnection.java

@@ -75,7 +75,7 @@ public class HttpServerConnection extends Thread {
 
     public void run() {
         try {
-            socket.setSoTimeout(30000);
+            socket.setSoTimeout(5000);
 
             HttpRequest request = new HttpRequest();
             if (!readRequestHeader(socket.getInputStream(), request)) {
@@ -106,10 +106,13 @@ public class HttpServerConnection extends Thread {
 
             try {
                 handler.handle(relativePath, request, response);
+            } catch (IOException e) {
+                throw e;
             } catch (Exception e) {
                 log.log(Level.SEVERE, "HttpHandler '" + handler + "' has thown an exception", e);
-                e.printStackTrace();
+                if (socket != null) {
                     socket.close();
+                }
                 return;
             }
 

src/main/java/org/dynmap/web/handlers/ClientConfigurationHandler.java

@@ -1,7 +1,6 @@
 package org.dynmap.web.handlers;
 
 import java.io.BufferedOutputStream;
-import java.io.IOException;
 import java.util.Date;
 import java.util.Map;
 
@@ -16,7 +15,7 @@ public class ClientConfigurationHandler implements HttpHandler {
         this.configuration = configuration;
     }
     @Override
-    public void handle(String path, HttpRequest request, HttpResponse response) throws IOException {
+    public void handle(String path, HttpRequest request, HttpResponse response) throws Exception {
         String s = Json.stringifyJson(configuration);
 
         byte[] bytes = s.getBytes();

src/main/java/org/dynmap/web/handlers/ClientUpdateHandler.java

@@ -1,7 +1,6 @@
 package org.dynmap.web.handlers;
 
 import java.io.BufferedOutputStream;
-import java.io.IOException;
 import java.util.Date;
 
 import org.bukkit.World;
@@ -26,7 +25,7 @@ public class ClientUpdateHandler implements HttpHandler {
     }
 
     @Override
-    public void handle(String path, HttpRequest request, HttpResponse response) throws IOException {
+    public void handle(String path, HttpRequest request, HttpResponse response) throws Exception {
         long current = System.currentTimeMillis();
         long cutoff = 0;
 

src/main/java/org/dynmap/web/handlers/FileHandler.java

@@ -56,9 +56,11 @@ public abstract class FileHandler implements HttpHandler {
     }
     
     @Override
-    public void handle(String path, HttpRequest request, HttpResponse response) throws IOException {
+    public void handle(String path, HttpRequest request, HttpResponse response) throws Exception {
+        InputStream fileInput = null;
+        try {
             path = formatPath(path);
-        InputStream fileInput = getFileInput(path);
+            fileInput = getFileInput(path);
             if (fileInput == null) {
                 response.statusCode = 404;
                 response.statusMessage = "Not found";
@@ -81,5 +83,11 @@ public abstract class FileHandler implements HttpHandler {
                 throw e;
             }
             fileInput.close();
+        } catch (Exception e) {
+            if (fileInput != null) {
+                try { fileInput.close(); } catch (IOException ex) { }
+            }
+            throw e;
+        }
     }
 }