Merge branch 'master' into 3.0.0

pull/1303/head
Nikita 7 years ago
commit 48351f8823

@ -79,9 +79,9 @@ public class RedisClient {
addr = new InetSocketAddress(config.getAddress().getHost(), config.getAddress().getPort());
channels = new DefaultChannelGroup(config.getGroup().next());
bootstrap = createBootstrap(config, Type.PLAIN);
pubSubBootstrap = createBootstrap(config, Type.PUBSUB);
channels = new DefaultChannelGroup(config.getGroup().next());
this.commandTimeout = config.getCommandTimeout();
}
@ -172,9 +172,9 @@ public class RedisClient {
addr = new InetSocketAddress(config.getAddress().getHost(), config.getAddress().getPort());
channels = new DefaultChannelGroup(config.getGroup().next());
bootstrap = createBootstrap(config, Type.PLAIN);
pubSubBootstrap = createBootstrap(config, Type.PUBSUB);
channels = new DefaultChannelGroup(config.getGroup().next());
this.commandTimeout = config.getCommandTimeout();
}

Loading…
Cancel
Save