github-forks
/
redisson
mirror of https://github.com/redisson/redisson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

refactoring

Browse Source
pull/1068/head
Nikita 7 years ago
parent 6327511772
commit 8f30949927
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File

13
redisson/src/main/java/org/redisson/command/CommandBatchService.java
Unescape Escape View File

@ -45,7 +45,6 @@ import org.redisson.connection.ConnectionManager;
import org.redisson.connection.MasterSlaveEntry; import org.redisson.connection.MasterSlaveEntry;
import org.redisson.connection.NodeSource; import org.redisson.connection.NodeSource;
import org.redisson.connection.NodeSource.Redirect; import org.redisson.connection.NodeSource.Redirect;
import org.redisson.misc.LogHelper;
import org.redisson.misc.RPromise; import org.redisson.misc.RPromise;
import org.redisson.misc.RedissonObjectFactory; import org.redisson.misc.RedissonObjectFactory;
@ -277,7 +276,7 @@ public class CommandBatchService extends CommandAsyncService {
if (future.isCancelled() && connectionFuture.cancel(false)) { if (future.isCancelled() && connectionFuture.cancel(false)) {
log.debug("Connection obtaining canceled for batch"); log.debug("Connection obtaining canceled for batch");
details.getTimeout().cancel(); details.getTimeout().cancel();
if (details.getAttemptPromise().cancel(false)) { if (attemptPromise.cancel(false)) {
free(entry); free(entry);
} }
} }
@ -301,7 +300,7 @@ public class CommandBatchService extends CommandAsyncService {
if (details.getException() == null) { if (details.getException() == null) {
details.setException(new RedisTimeoutException("Unable to send batch after " + connectionManager.getConfig().getRetryAttempts() + " retry attempts")); details.setException(new RedisTimeoutException("Unable to send batch after " + connectionManager.getConfig().getRetryAttempts() + " retry attempts"));
} }
details.getAttemptPromise().tryFailure(details.getException()); attemptPromise.tryFailure(details.getException());
} }
return; return;
} }
@ -418,14 +417,14 @@ public class CommandBatchService extends CommandAsyncService {
private void checkWriteFuture(Entry entry, final RPromise<Void> attemptPromise, AsyncDetails details, private void checkWriteFuture(Entry entry, final RPromise<Void> attemptPromise, AsyncDetails details,
final RedisConnection connection, ChannelFuture future, boolean noResult, long responseTimeout, int attempts) { final RedisConnection connection, ChannelFuture future, boolean noResult, long responseTimeout, int attempts) {
if (future.isCancelled() || details.getAttemptPromise().isDone()) { if (future.isCancelled() || attemptPromise.isDone()) {
return; return;
} }
if (!future.isSuccess()) { if (!future.isSuccess()) {
details.setException(new WriteRedisConnectionException("Can't write command batch to channel: " + future.channel(), future.cause())); details.setException(new WriteRedisConnectionException("Can't write command batch to channel: " + future.channel(), future.cause()));
if (details.getAttempt() == attempts) { if (details.getAttempt() == attempts) {
details.getAttemptPromise().tryFailure(details.getException()); attemptPromise.tryFailure(details.getException());
} }
return; return;
} }
@ -461,8 +460,8 @@ public class CommandBatchService extends CommandAsyncService {
return; return;
} }
if (details.getAttemptPromise().isDone() || details.getMainPromise().isDone()) { if (attemptPromise.isDone() || details.getMainPromise().isDone()) {
releaseConnection(source, connFuture, details.isReadOnlyMode(), details.getAttemptPromise(), details); releaseConnection(source, connFuture, details.isReadOnlyMode(), attemptPromise, details);
return; return;
} }

Write Preview
Loading…
Cancel
Save