diff options
| author | Simon Rettberg | 2015-09-02 18:05:14 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2015-09-02 18:05:14 +0200 |
| commit | b0da27651d7a481f65806a0d0a28f5523a4061d4 (patch) | |
| tree | db82875cf1d1d41bd845c9081989216015ad73f9 /dozentenmodulserver/src/main/java/fi | |
| parent | [client] ImageList: "Show only usable" combobox selection & its filter (diff) | |
| download | tutor-module-b0da27651d7a481f65806a0d0a28f5523a4061d4.tar.gz tutor-module-b0da27651d7a481f65806a0d0a28f5523a4061d4.tar.xz tutor-module-b0da27651d7a481f65806a0d0a28f5523a4061d4.zip | |
[server] Return machine description via http
Diffstat (limited to 'dozentenmodulserver/src/main/java/fi')
| -rw-r--r-- | dozentenmodulserver/src/main/java/fi/iki/elonen/NanoHTTPD.java | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/dozentenmodulserver/src/main/java/fi/iki/elonen/NanoHTTPD.java b/dozentenmodulserver/src/main/java/fi/iki/elonen/NanoHTTPD.java index 854f1686..f8e44fa8 100644 --- a/dozentenmodulserver/src/main/java/fi/iki/elonen/NanoHTTPD.java +++ b/dozentenmodulserver/src/main/java/fi/iki/elonen/NanoHTTPD.java @@ -40,7 +40,6 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.io.OutputStream; -import java.io.PrintWriter; import java.io.PushbackInputStream; import java.io.Reader; import java.io.UnsupportedEncodingException; @@ -52,9 +51,7 @@ import java.net.SocketException; import java.net.SocketTimeoutException; import java.net.URLDecoder; import java.nio.charset.StandardCharsets; -import java.text.SimpleDateFormat; import java.util.ArrayList; -import java.util.Date; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -63,7 +60,6 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; import java.util.StringTokenizer; -import java.util.TimeZone; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.ExecutorService; import java.util.concurrent.RejectedExecutionException; @@ -72,7 +68,6 @@ import java.util.concurrent.TimeUnit; import org.joda.time.format.DateTimeFormat; import org.joda.time.format.DateTimeFormatter; -import org.joda.time.format.DateTimeFormatterBuilder; /** * A simple, tiny, nicely embeddable HTTP server in Java @@ -838,7 +833,7 @@ public abstract class NanoHTTPD implements Runnable { } catch (Exception e) { safeClose(inputStream); safeClose(outputStream); - throw new SocketException("NanoHttpd Shutdown"); + throw e; } if (read == -1) { // socket was been closed |
