diff options
author | ritchie <ritchie@gmx.at> | 2015-05-23 14:54:07 +0200 |
---|---|---|
committer | ritchie <ritchie@gmx.at> | 2015-05-23 14:54:07 +0200 |
commit | 29d1d190b5d5acd569c38ec49794a8698f8ed8c0 (patch) | |
tree | ea0d38431752da56530f28ff2c504a047ee2fa59 | |
parent | 2c298d9c6d5fc2a2423386c7a151f669d617d4ee (diff) | |
download | nanohttpd-29d1d190b5d5acd569c38ec49794a8698f8ed8c0.tar.gz |
fix jdk to 1.6
-rw-r--r-- | .travis.yml | 2 | ||||
-rw-r--r-- | core/src/main/java/fi/iki/elonen/NanoHTTPD.java | 18 | ||||
-rw-r--r-- | pom.xml | 2 |
3 files changed, 14 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index b36965e..710073b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: java jdk: -- oraclejdk7 +- oraclejdk6 install: - mvn install -DskipTests=true diff --git a/core/src/main/java/fi/iki/elonen/NanoHTTPD.java b/core/src/main/java/fi/iki/elonen/NanoHTTPD.java index b35dc15..a00f49e 100644 --- a/core/src/main/java/fi/iki/elonen/NanoHTTPD.java +++ b/core/src/main/java/fi/iki/elonen/NanoHTTPD.java @@ -1490,13 +1490,19 @@ public abstract class NanoHTTPD { return res; } - private static final void safeClose(Closeable closeable) { - if (closeable != null) { - try { - closeable.close(); - } catch (IOException e) { - NanoHTTPD.LOG.log(Level.SEVERE, "Could not close", e); + private static final void safeClose(Object closeable) { + try { + if (closeable instanceof Closeable) { + ((Closeable) closeable).close(); + } else if (closeable instanceof Socket) { + ((Socket) closeable).close(); + } else if (closeable instanceof ServerSocket) { + ((ServerSocket) closeable).close(); + } else { + throw new IllegalArgumentException("Unknown object to close"); } + } catch (IOException e) { + NanoHTTPD.LOG.log(Level.SEVERE, "Could not close", e); } } @@ -292,7 +292,7 @@ <configuration> <linkXref>true</linkXref> <sourceEncoding>UTF-8</sourceEncoding> - <targetJdk>1.7</targetJdk> + <targetJdk>1.6</targetJdk> <skipEmptyReport>false</skipEmptyReport> <minimumTokens>50</minimumTokens> </configuration> |