Skip to content

Reuse SafeEncoder.encodeObject() #2407

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

Merged
merged 1 commit into from
Mar 9, 2021
Merged

Reuse SafeEncoder.encodeObject() #2407

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 2 additions & 22 deletions src/main/java/redis/clients/jedis/Jedis.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2977,7 +2977,7 @@ public Object eval(final String script, final int keyCount, final String... para
client.eval(script, keyCount, params);
client.setTimeoutInfinite();
try {
return getEvalResult();
return SafeEncoder.encodeObject(client.getOne());
} finally {
client.rollbackTimeout();
}
Expand All @@ -2998,26 +2998,6 @@ public Object evalsha(final String sha1) {
return evalsha(sha1, 0);
}

private Object getEvalResult() {
return evalResult(client.getOne());
}

private Object evalResult(Object result) {
if (result instanceof byte[]) return SafeEncoder.encode((byte[]) result);

if (result instanceof List<?>) {
List<?> list = (List<?>) result;
List<Object> listResult = new ArrayList<>(list.size());
for (Object bin : list) {
listResult.add(evalResult(bin));
}

return listResult;
}

return result;
}

@Override
public Object evalsha(final String sha1, final List<String> keys, final List<String> args) {
return evalsha(sha1, keys.size(), getParams(keys, args));
Expand All @@ -3027,7 +3007,7 @@ public Object evalsha(final String sha1, final List<String> keys, final List<Str
public Object evalsha(final String sha1, final int keyCount, final String... params) {
checkIsInMultiOrPipeline();
client.evalsha(sha1, keyCount, params);
return getEvalResult();
return SafeEncoder.encodeObject(client.getOne());
}

@Override
Expand Down