Merge branch 'master' of github.com:xetorthio/jedis

This commit is contained in:
Jungtaek Lim
2014-11-11 07:56:51 +09:00
2 changed files with 2 additions and 1 deletions

View File

@@ -3,5 +3,6 @@ jdk:
- openjdk6 - openjdk6
- openjdk7 - openjdk7
- oraclejdk7 - oraclejdk7
- oraclejdk8
install: make travis-install install: make travis-install
script: make test script: make test

View File

@@ -155,8 +155,8 @@ public class Connection implements Closeable {
if (isConnected()) { if (isConnected()) {
try { try {
inputStream.close(); inputStream.close();
outputStream.close();
if (!socket.isClosed()) { if (!socket.isClosed()) {
outputStream.close();
socket.close(); socket.close();
} }
} catch (IOException ex) { } catch (IOException ex) {