[server] Delete incomplete uploads (missing meta data)

1 files changed, 3 insertions, 2 deletions

diff --git a/dozentenmodulserver/src/main/java/fi/iki/elonen/NanoHTTPD.java b/dozentenmodulserver/src/main/java/fi/iki/elonen/NanoHTTPD.java
index 8d38f577..7296abea 100644
--- a/dozentenmodulserver/src/main/java/fi/iki/elonen/NanoHTTPD.java
+++ b/dozentenmodulserver/src/main/java/fi/iki/elonen/NanoHTTPD.java
@@ -41,7 +41,6 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.PushbackInputStream;
-import java.io.Reader;
 import java.io.UnsupportedEncodingException;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
@@ -219,7 +218,8 @@ public abstract class NanoHTTPD implements Runnable {
 						} catch (Exception e) {
 							// When the socket is closed by the client, we throw our own SocketException
 							// to break the  "keep alive" loop above.
-							if (!(e instanceof SocketException && "NanoHttpd Shutdown".equals(e.getMessage()))) {
+							if (!(e instanceof SocketTimeoutException)
+									&& !(e instanceof SocketException && "NanoHttpd Shutdown".equals(e.getMessage()))) {
 								e.printStackTrace();
 							}
 						} finally {
@@ -971,6 +971,7 @@ public abstract class NanoHTTPD implements Runnable {
 						baos.write(pbuf, 0, ret);
 					}
 					String postLine = new String(baos.toByteArray(), cs);
+					baos.close();
 					// Handle application/x-www-form-urlencoded
 					if ("application/x-www-form-urlencoded".equalsIgnoreCase(contentType)) {
 						decodeParms(postLine, parms);