andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[#1735] Disable usage of JdkZlibDecoder by default, will be enabled in 4.1.0.Final

Browse Source
This commit is contained in:
Norman Maurer 2013-08-26 08:15:30 +02:00
parent 80d30c3dd8
commit 65d24a7647
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
codec/src/main/java/io/netty/handler/codec/compression/ZlibCodecFactory.java
View File

@ -16,11 +16,22 @@
package io.netty.handler.codec.compression; package io.netty.handler.codec.compression;
import io.netty.util.internal.PlatformDependent; import io.netty.util.internal.PlatformDependent;
import io.netty.util.internal.SystemPropertyUtil;
import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.logging.InternalLoggerFactory;
/** /**
* Creates a new {@link ZlibEncoder} and a new {@link ZlibDecoder}. * Creates a new {@link ZlibEncoder} and a new {@link ZlibDecoder}.
*/ */
public final class ZlibCodecFactory { public final class ZlibCodecFactory {
private static final InternalLogger logger = InternalLoggerFactory.getInstance(ZlibCodecFactory.class);
private static final boolean noJdkZlibDecoder;
static {
noJdkZlibDecoder = !SystemPropertyUtil.getBoolean("io.netty.noJdkZlibDecoder", true);
logger.debug("-Dio.netty.noJdkZlibDecoder: {}", noJdkZlibDecoder);
}
public static ZlibEncoder newZlibEncoder(int compressionLevel) { public static ZlibEncoder newZlibEncoder(int compressionLevel) {
if (PlatformDependent.javaVersion() < 7) { if (PlatformDependent.javaVersion() < 7) {
@ -79,7 +90,7 @@ public final class ZlibCodecFactory {
} }
public static ZlibDecoder newZlibDecoder() { public static ZlibDecoder newZlibDecoder() {
if (PlatformDependent.javaVersion() < 7) { if (PlatformDependent.javaVersion() < 7 || noJdkZlibDecoder) {
return new JZlibDecoder(); return new JZlibDecoder();
} else { } else {
return new JdkZlibDecoder(); return new JdkZlibDecoder();
@ -91,7 +102,7 @@ public final class ZlibCodecFactory {
case ZLIB_OR_NONE: case ZLIB_OR_NONE:
return new JZlibDecoder(wrapper); return new JZlibDecoder(wrapper);
default: default:
if (PlatformDependent.javaVersion() < 7) { if (PlatformDependent.javaVersion() < 7 || noJdkZlibDecoder) {
return new JZlibDecoder(wrapper); return new JZlibDecoder(wrapper);
} else { } else {
return new JdkZlibDecoder(wrapper); return new JdkZlibDecoder(wrapper);
@ -100,7 +111,7 @@ public final class ZlibCodecFactory {
} }
public static ZlibDecoder newZlibDecoder(byte[] dictionary) { public static ZlibDecoder newZlibDecoder(byte[] dictionary) {
if (PlatformDependent.javaVersion() < 7) { if (PlatformDependent.javaVersion() < 7 || noJdkZlibDecoder) {
return new JZlibDecoder(dictionary); return new JZlibDecoder(dictionary);
} else { } else {
return new JdkZlibDecoder(dictionary); return new JdkZlibDecoder(dictionary);