merge

StackExchange.Redis/StackExchange/Redis/RedisDatabase.cs

@@ -786,6 +786,7 @@ public bool LockExtend(RedisKey key, RedisValue value, TimeSpan expiry, CommandF
         {
             if (value.IsNull) throw new ArgumentNullException("value");
             var tran = GetLockExtendTransaction(key, value, expiry);
+
             if (tran != null) return tran.Execute(flags);
 
             // without transactions (twemproxy etc), we can't enforce the "value" part
@@ -863,6 +864,7 @@ public RedisResult ScriptEvaluate(string script, RedisKey[] keys = null, RedisVa
             try
             {
                 return ExecuteSync(msg, ResultProcessor.ScriptResult);
+
             }
             catch (RedisServerException)
             {
@@ -876,6 +878,7 @@ public RedisResult ScriptEvaluate(byte[] hash, RedisKey[] keys = null, RedisValu
             var msg = new ScriptEvalMessage(Db, flags, hash, keys, values);
             return ExecuteSync(msg, ResultProcessor.ScriptResult);
         }
+
         public RedisResult ScriptEvaluate(LuaScript script, object parameters = null, CommandFlags flags = CommandFlags.None)
         {
             return script.Evaluate(this, parameters, null, flags);
@@ -885,6 +888,7 @@ public RedisResult ScriptEvaluate(LoadedLuaScript script, object parameters = nu
             return script.Evaluate(this, parameters, null, flags);
         }
 
+
         public Task<RedisResult> ScriptEvaluateAsync(string script, RedisKey[] keys = null, RedisValue[] values = null, CommandFlags flags = CommandFlags.None)
         {
             var msg = new ScriptEvalMessage(Db, flags, script, keys, values);
@@ -895,6 +899,7 @@ public Task<RedisResult> ScriptEvaluateAsync(byte[] hash, RedisKey[] keys = null
             var msg = new ScriptEvalMessage(Db, flags, hash, keys, values);
             return ExecuteAsync(msg, ResultProcessor.ScriptResult);
         }
+
         public Task<RedisResult> ScriptEvaluateAsync(LuaScript script, object parameters = null, CommandFlags flags = CommandFlags.None)
         {
             return script.EvaluateAsync(this, parameters, null, flags);
@@ -2407,4 +2412,4 @@ protected override bool SetResultCore(PhysicalConnection connection, Message mes
             }
         }
     }
-}
+}
\ No newline at end of file