From 6301ff58d9bf4f7853b097efe3d6a5114b1f5db9 Mon Sep 17 00:00:00 2001 From: Marcos Nils Date: Wed, 23 Apr 2014 15:03:47 -0300 Subject: [PATCH 1/6] Add support for jdk8 in travis --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index aa9797b..ea02f83 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,5 +3,6 @@ jdk: - openjdk6 - openjdk7 - oraclejdk7 + - oraclejdk8 install: make travis-install script: make test From a71501251dcf99d3050f398731ede071cfe827fd Mon Sep 17 00:00:00 2001 From: Marcos Lilljedahl Date: Thu, 6 Nov 2014 21:37:12 -0300 Subject: [PATCH 2/6] Change travis to run tests again jdk8 only --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index aa9797b..bdde7d2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ language: java jdk: - - openjdk6 - - openjdk7 - - oraclejdk7 + - oraclejdk8 + - openjdk8 install: make travis-install script: make test From fe261c7784d8719d220a28dfcae707d11900524e Mon Sep 17 00:00:00 2001 From: Marcos Lilljedahl Date: Thu, 6 Nov 2014 21:42:04 -0300 Subject: [PATCH 3/6] Remove unnecessary jdks for testing purposes --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 242b858..bdde7d2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,5 @@ language: java jdk: - - openjdk6 - - openjdk7 - - oraclejdk7 - oraclejdk8 - openjdk8 install: make travis-install From 161e50917802b260dc38a830494524645e59d5bc Mon Sep 17 00:00:00 2001 From: Marcos Lilljedahl Date: Thu, 6 Nov 2014 22:45:04 -0300 Subject: [PATCH 4/6] Fix disconnect socket closing to make it work with java 8 --- src/main/java/redis/clients/jedis/Connection.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/redis/clients/jedis/Connection.java b/src/main/java/redis/clients/jedis/Connection.java index 6807ac8..abb65fc 100644 --- a/src/main/java/redis/clients/jedis/Connection.java +++ b/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) { From d67b3cfcf2d3d2d8cd34073c647a29a1e53ff107 Mon Sep 17 00:00:00 2001 From: Marcos Lilljedahl Date: Thu, 6 Nov 2014 22:48:51 -0300 Subject: [PATCH 5/6] Add again other jdks --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index bdde7d2..242b858 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,8 @@ language: java jdk: + - openjdk6 + - openjdk7 + - oraclejdk7 - oraclejdk8 - openjdk8 install: make travis-install From 4cb77ea6b811805888b89a7389c710a19ad37373 Mon Sep 17 00:00:00 2001 From: Marcos Lilljedahl Date: Thu, 6 Nov 2014 22:52:29 -0300 Subject: [PATCH 6/6] Remove opendk as it's not present --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 242b858..ea02f83 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,5 @@ jdk: - openjdk7 - oraclejdk7 - oraclejdk8 - - openjdk8 install: make travis-install script: make test