Merge pull request #82 from sherifmoursi/removeStackTrace

removed stack trace caused by a closed socket from client side

1 files changed, 38 insertions, 4 deletions

diff --git a/core/src/main/java/fi/iki/elonen/NanoHTTPD.java b/core/src/main/java/fi/iki/elonen/NanoHTTPD.java
index 424856b..9b73e1f 100644
--- a/core/src/main/java/fi/iki/elonen/NanoHTTPD.java
+++ b/core/src/main/java/fi/iki/elonen/NanoHTTPD.java
@@ -1,11 +1,40 @@
 package fi.iki.elonen;
 
-import java.io.*;
-import java.net.*;
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.Closeable;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.io.RandomAccessFile;
+import java.io.SequenceInputStream;
+import java.io.UnsupportedEncodingException;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.net.SocketException;
+import java.net.URLDecoder;
 import java.nio.ByteBuffer;
 import java.nio.channels.FileChannel;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import java.util.StringTokenizer;
+import java.util.TimeZone;
 
 /**
  * A simple, tiny, nicely embeddable HTTP server in Java
@@ -822,7 +851,12 @@ public abstract class NanoHTTPD {
                 splitbyte = 0;
                 rlen = 0;
                 {
-                    int read = inputStream.read(buf, 0, BUFSIZE);
+                    int read = -1;
+                    try {
+                        read = inputStream.read(buf, 0, BUFSIZE);
+                    } catch (SocketException e) {
+                        throw new SocketException("NanoHttpd Shutdown");
+                    }
                     if (read == -1) {
                         // socket was been closed
                         throw new SocketException("NanoHttpd Shutdown");