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

.travis.yml

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

src/main/java/redis/clients/jedis/Connection.java

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