Skip to content

java-nsq-client: update netty to 4.1.19.Final#44

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

Open
mgenov wants to merge 1 commit into
base:master
Choose a base branch
from
Open

java-nsq-client: update netty to 4.1.19.Final #44

Show file tree
Hide file tree
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
6 changes: 3 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -142,7 +142,7 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
<version>4.0.39.Final</version>
<version>4.1.19.Final</version>
</dependency>

<dependency>
Expand All@@ -151,7 +151,7 @@
<version>19.0</version>
</dependency>

<dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.6.4</version>
Expand All@@ -173,7 +173,7 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-tcnative</artifactId>
<version>1.1.33.Fork18</version>
<version>2.0.7.Final</version>
<classifier>${os.detected.classifier}</classifier>
<scope>test</scope>
</dependency>
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/com/github/brainlag/nsq/netty/NSQFeatureDetectionHandler.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,8 @@
import io.netty.channel.ChannelPipeline;
import io.netty.channel.SimpleChannelInboundHandler;
import io.netty.handler.codec.LengthFieldBasedFrameDecoder;
import io.netty.handler.codec.compression.SnappyFramedDecoder;
import io.netty.handler.codec.compression.SnappyFramedEncoder;
import io.netty.handler.codec.compression.SnappyFrameDecoder;
import io.netty.handler.codec.compression.SnappyFrameEncoder;
import io.netty.handler.codec.compression.ZlibCodecFactory;
import io.netty.handler.codec.compression.ZlibWrapper;
import io.netty.handler.ssl.SslHandler;
Expand DownExpand Up@@ -59,15 +59,15 @@ protected void channelRead0(final ChannelHandlerContext ctx, final NSQFrame msg)
sslHandler.setSingleDecode(true);
pipeline.addBefore("LengthFieldBasedFrameDecoder", "SSLHandler", sslHandler);
if (snappy) {
pipeline.addBefore("NSQEncoder", "SnappyEncoder", new SnappyFramedEncoder());
pipeline.addBefore("NSQEncoder", "SnappyEncoder", new SnappyFrameEncoder());
}
if (deflate) {
pipeline.addBefore("NSQEncoder", "DeflateEncoder", ZlibCodecFactory.newZlibEncoder(ZlibWrapper.NONE,
con.getConfig().getDeflateLevel()));
}
}
if (!ssl && snappy) {
pipeline.addBefore("NSQEncoder", "SnappyEncoder", new SnappyFramedEncoder());
pipeline.addBefore("NSQEncoder", "SnappyEncoder", new SnappyFrameEncoder());
reinstallDefaultDecoder = installSnappyDecoder(pipeline);
}
if (!ssl && deflate) {
Expand DownExpand Up@@ -102,7 +102,7 @@ private boolean installDeflateDecoder(final ChannelPipeline pipeline, final Conn
private boolean installSnappyDecoder(final ChannelPipeline pipeline) {
finished = true;
LogManager.getLogger(this).info("Adding snappy to pipline");
pipeline.replace("LengthFieldBasedFrameDecoder", "SnappyDecoder", new SnappyFramedDecoder());
pipeline.replace("LengthFieldBasedFrameDecoder", "SnappyDecoder", new SnappyFrameDecoder());
return false;
}

Expand Down