Skip to content

Upgrade JDK to 8 refer #1863 #1864

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

Upgrade JDK to 8 refer #1863 #1864

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e0cc432
Upgrade JDK to 8
smadasu Sep 9, 2018
5bbfd81
Upgrade JDK to 8 refer#1863 -- fix failing tests
smadasu Sep 9, 2018
1d0fd33
Upgrade JDK to 8 refer#1863 -- remove jdk7
smadasu Sep 9, 2018
02552d9
Merge branch 'master' into JDK8_Upgrade
sazzad16 Aug 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ dist: trusty
sudo: required
language: java
jdk:
- openjdk7
- oraclejdk8
before_install:
- wget -O stunnel.tar.gz ftp://ftp.stunnel.org/stunnel/archive/5.x/stunnel-5.29.tar.gz
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<plugin>
Expand Down
6 changes: 4 additions & 2 deletions src/main/java/redis/clients/jedis/params/SetParams.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,13 @@ public byte[][] getByteParams(byte[]... args) {

if (contains(EX)) {
byteParams.add(SafeEncoder.encode(EX));
byteParams.add(SafeEncoder.encode(String.valueOf(getParam(EX))));
final Object param = getParam(EX);
byteParams.add(SafeEncoder.encode(String.valueOf(param)));
}
if (contains(PX)) {
byteParams.add(SafeEncoder.encode(PX));
byteParams.add(SafeEncoder.encode(String.valueOf(getParam(PX))));
final Object param = getParam(PX);
byteParams.add(SafeEncoder.encode(String.valueOf(param)));
}

return byteParams.toArray(new byte[byteParams.size()][]);
Expand Down