@@ -2977,7 +2977,7 @@ public Object eval(final String script, final int keyCount, final String... para
29772977 client .eval (script , keyCount , params );
29782978 client .setTimeoutInfinite ();
29792979 try {
2980- return getEvalResult ( );
2980+ return SafeEncoder . encodeObject ( client . getOne () );
29812981 } finally {
29822982 client .rollbackTimeout ();
29832983 }
@@ -2998,26 +2998,6 @@ public Object evalsha(final String sha1) {
29982998 return evalsha (sha1 , 0 );
29992999 }
30003000
3001- private Object getEvalResult () {
3002- return evalResult (client .getOne ());
3003- }
3004-
3005- private Object evalResult (Object result ) {
3006- if (result instanceof byte []) return SafeEncoder .encode ((byte []) result );
3007-
3008- if (result instanceof List <?>) {
3009- List <?> list = (List <?>) result ;
3010- List <Object > listResult = new ArrayList <>(list .size ());
3011- for (Object bin : list ) {
3012- listResult .add (evalResult (bin ));
3013- }
3014-
3015- return listResult ;
3016- }
3017-
3018- return result ;
3019- }
3020-
30213001 @ Override
30223002 public Object evalsha (final String sha1 , final List <String > keys , final List <String > args ) {
30233003 return evalsha (sha1 , keys .size (), getParams (keys , args ));
@@ -3027,7 +3007,7 @@ public Object evalsha(final String sha1, final List<String> keys, final List<Str
30273007 public Object evalsha (final String sha1 , final int keyCount , final String ... params ) {
30283008 checkIsInMultiOrPipeline ();
30293009 client .evalsha (sha1 , keyCount , params );
3030- return getEvalResult ( );
3010+ return SafeEncoder . encodeObject ( client . getOne () );
30313011 }
30323012
30333013 @ Override
0 commit comments