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

Fix compiler warnings

Browse Source
This commit is contained in:
Trustin Lee 2013-04-04 16:31:41 +09:00
parent 4505e7f1b3
commit 6dfa455f9e
3 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
codec/src/main/java/io/netty/handler/codec/compression/JZlibEncoder.java
View File

@ -15,14 +15,14 @@
*/ */
package io.netty.handler.codec.compression; package io.netty.handler.codec.compression;
import com.jcraft.jzlib.Deflater;
import com.jcraft.jzlib.JZlib;
import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled; import io.netty.buffer.Unpooled;
import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelFuture;
import io.netty.channel.ChannelFutureListener; import io.netty.channel.ChannelFutureListener;
import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelPromise; import io.netty.channel.ChannelPromise;
import com.jcraft.jzlib.JZlib;
import com.jcraft.jzlib.Deflater;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;
@ -380,7 +380,7 @@ public class JZlibEncoder extends ZlibEncoder {
// Write the ADLER32 checksum (stream footer). // Write the ADLER32 checksum (stream footer).
int resultCode = z.deflate(JZlib.Z_FINISH); int resultCode = z.deflate(JZlib.Z_FINISH);
if (resultCode != JZlib.Z_OK && resultCode != JZlib.Z_STREAM_END) { if (resultCode != JZlib.Z_OK && resultCode != JZlib.Z_STREAM_END) {
future.setFailure(ZlibUtil.exception(z, "compression failure", resultCode)); future.setFailure(ZlibUtil.deflaterException(z, "compression failure", resultCode));
return future; return future;
} else if (z.next_out_index != 0) { } else if (z.next_out_index != 0) {
footer = Unpooled.wrappedBuffer(out, 0, z.next_out_index); footer = Unpooled.wrappedBuffer(out, 0, z.next_out_index);

20
codec/src/main/java/io/netty/handler/codec/compression/ZlibUtil.java
View File

@ -15,21 +15,29 @@
*/ */
package io.netty.handler.codec.compression; package io.netty.handler.codec.compression;
import com.jcraft.jzlib.Deflater;
import com.jcraft.jzlib.Inflater;
import com.jcraft.jzlib.JZlib; import com.jcraft.jzlib.JZlib;
import com.jcraft.jzlib.ZStream;
/** /**
* Utility methods used by {@link JZlibEncoder} and {@link JZlibDecoder}. * Utility methods used by {@link JZlibEncoder} and {@link JZlibDecoder}.
*/ */
final class ZlibUtil { final class ZlibUtil {
static void fail(ZStream z, String message, int resultCode) { static void fail(Inflater z, String message, int resultCode) {
throw exception(z, message, resultCode); throw inflaterException(z, message, resultCode);
} }
static CompressionException exception(ZStream z, String message, int resultCode) { static void fail(Deflater z, String message, int resultCode) {
return new CompressionException(message + " (" + resultCode + ')' + throw deflaterException(z, message, resultCode);
(z.msg != null? ": " + z.msg : "")); }
static CompressionException inflaterException(Inflater z, String message, int resultCode) {
return new CompressionException(message + " (" + resultCode + ')' + (z.msg != null? ": " + z.msg : ""));
}
static CompressionException deflaterException(Deflater z, String message, int resultCode) {
return new CompressionException(message + " (" + resultCode + ')' + (z.msg != null? ": " + z.msg : ""));
} }
static JZlib.WrapperType convertWrapperType(ZlibWrapper wrapper) { static JZlib.WrapperType convertWrapperType(ZlibWrapper wrapper) {

2
common/src/main/java/io/netty/util/concurrent/DefaultPromise.java
View File

@ -98,6 +98,7 @@ public class DefaultPromise<V> extends AbstractFuture<V> implements Promise<V> {
} }
@Override @Override
@SuppressWarnings("unchecked")
public Promise<V> addListener(GenericFutureListener <? extends Future<V>> listener) { public Promise<V> addListener(GenericFutureListener <? extends Future<V>> listener) {
if (listener == null) { if (listener == null) {
throw new NullPointerException("listener"); throw new NullPointerException("listener");
@ -459,6 +460,7 @@ public class DefaultPromise<V> extends AbstractFuture<V> implements Promise<V> {
state -= 0x10000000000L; state -= 0x10000000000L;
} }
@SuppressWarnings("unchecked")
private void notifyListeners() { private void notifyListeners() {
// This method doesn't need synchronization because: // This method doesn't need synchronization because:
// 1) This method is always called after synchronized (this) block. // 1) This method is always called after synchronized (this) block.