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

* Added preset dictionary support to ZlibDecoder (likewise I did in the previous revision of ZlibEncoder)

Browse Source 
* ZlibEncoder.fail() and exception() package-private so that ZlibDecoder can use it
This commit is contained in:
Trustin Lee 2009-10-21 03:41:03 +00:00
parent ab6a869825
commit f355d74eb0
2 changed files with 41 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/java/org/jboss/netty/handler/codec/compression/ZlibDecoder.java
View File

@ -42,9 +42,36 @@ public class ZlibDecoder extends OneToOneDecoder {
/** /**
* Creates a new instance. * Creates a new instance.
*
* @throws ZStreamException if failed to initialize zlib
*/ */
public ZlibDecoder() { public ZlibDecoder() throws ZStreamException {
z.inflateInit(); int resultCode = z.inflateInit();
if (resultCode != JZlib.Z_OK) {
ZlibEncoder.fail(z, "initialization failure", resultCode);
}
}
/**
* Creates a new instance with the specified preset dictionary.
*
* @throws ZStreamException if failed to initialize zlib
*/
public ZlibDecoder(byte[] dictionary) throws ZStreamException {
if (dictionary == null) {
throw new NullPointerException("dictionary");
}
int resultCode;
resultCode = z.inflateInit();
if (resultCode != JZlib.Z_OK) {
ZlibEncoder.fail(z, "initialization failure", resultCode);
} else {
resultCode = z.inflateSetDictionary(dictionary, dictionary.length);
if (resultCode != JZlib.Z_OK) {
ZlibEncoder.fail(z, "failed to set the dictionary", resultCode);
}
}
} }
@Override @Override

21
src/main/java/org/jboss/netty/handler/codec/compression/ZlibEncoder.java
View File

@ -79,7 +79,7 @@ public class ZlibEncoder extends OneToOneEncoder {
public ZlibEncoder(int compressionLevel) throws ZStreamException { public ZlibEncoder(int compressionLevel) throws ZStreamException {
int resultCode = z.deflateInit(compressionLevel, false); // Default: ZLIB format int resultCode = z.deflateInit(compressionLevel, false); // Default: ZLIB format
if (resultCode != JZlib.Z_OK) { if (resultCode != JZlib.Z_OK) {
fail("initialization failure", resultCode); fail(z, "initialization failure", resultCode);
} }
} }
@ -112,15 +112,18 @@ public class ZlibEncoder extends OneToOneEncoder {
* @throws ZStreamException if failed to initialize zlib * @throws ZStreamException if failed to initialize zlib
*/ */
public ZlibEncoder(int compressionLevel, byte[] dictionary) throws ZStreamException { public ZlibEncoder(int compressionLevel, byte[] dictionary) throws ZStreamException {
int resultCode; if (dictionary == null) {
throw new NullPointerException("dictionary");
}
int resultCode;
resultCode = z.deflateInit(compressionLevel, false); // Default: ZLIB format resultCode = z.deflateInit(compressionLevel, false); // Default: ZLIB format
if (resultCode != JZlib.Z_OK) { if (resultCode != JZlib.Z_OK) {
fail("initialization failure", resultCode); fail(z, "initialization failure", resultCode);
} else { } else {
resultCode = z.deflateSetDictionary(dictionary, dictionary.length); resultCode = z.deflateSetDictionary(dictionary, dictionary.length);
if (resultCode != JZlib.Z_OK){ if (resultCode != JZlib.Z_OK){
fail("failed to set the dictionary", resultCode); fail(z, "failed to set the dictionary", resultCode);
} }
} }
} }
@ -149,7 +152,7 @@ public class ZlibEncoder extends OneToOneEncoder {
// Note that Z_PARTIAL_FLUSH has been deprecated. // Note that Z_PARTIAL_FLUSH has been deprecated.
int resultCode = z.deflate(JZlib.Z_SYNC_FLUSH); int resultCode = z.deflate(JZlib.Z_SYNC_FLUSH);
if (resultCode != JZlib.Z_OK) { if (resultCode != JZlib.Z_OK) {
fail("compression failure", resultCode); fail(z, "compression failure", resultCode);
} }
if (z.next_out_index != 0) { if (z.next_out_index != 0) {
@ -213,7 +216,7 @@ public class ZlibEncoder extends OneToOneEncoder {
if (resultCode != JZlib.Z_OK && resultCode != JZlib.Z_STREAM_END) { if (resultCode != JZlib.Z_OK && resultCode != JZlib.Z_STREAM_END) {
future = Channels.failedFuture( future = Channels.failedFuture(
ctx.getChannel(), ctx.getChannel(),
exception("compression failure", resultCode)); exception(z, "compression failure", resultCode));
} else if (z.next_out_index != 0) { } else if (z.next_out_index != 0) {
future = Channels.future(ctx.getChannel()); future = Channels.future(ctx.getChannel());
Channels.write( Channels.write(
@ -248,11 +251,11 @@ public class ZlibEncoder extends OneToOneEncoder {
} }
} }
private void fail(String message, int resultCode) throws ZStreamException { static void fail(ZStream z, String message, int resultCode) throws ZStreamException {
throw exception(message, resultCode); throw exception(z, message, resultCode);
} }
private ZStreamException exception(String message, int resultCode) { static ZStreamException exception(ZStream z, String message, int resultCode) {
return new ZStreamException(message + " (" + resultCode + ")" + return new ZStreamException(message + " (" + resultCode + ")" +
(z.msg != null? ": " + z.msg : "")); (z.msg != null? ": " + z.msg : ""));
} }