From 464ea90492f2fc7aa4892cb6e1c65d998caa11a2 Mon Sep 17 00:00:00 2001 From: Trustin Lee Date: Tue, 3 Nov 2009 07:44:06 +0000 Subject: [PATCH] Fixed some non-sense code as advised by FindBugs --- .../netty/channel/socket/http/HttpTunnelingServlet.java | 2 +- .../netty/example/proxy/HexDumpProxyInboundHandler.java | 2 +- .../jboss/netty/handler/codec/compression/ZlibEncoder.java | 2 +- .../jboss/netty/handler/codec/http/HttpContentEncoder.java | 3 ++- .../org/jboss/netty/handler/stream/ChunkedWriteHandler.java | 4 +++- .../java/org/jboss/netty/util/internal/jzlib/Deflate.java | 5 +---- .../java/org/jboss/netty/util/internal/jzlib/InfBlocks.java | 1 - .../java/org/jboss/netty/util/internal/jzlib/InfCodes.java | 1 - .../java/org/jboss/netty/util/internal/jzlib/Inflate.java | 1 - .../java/org/jboss/netty/util/internal/jzlib/ZStream.java | 1 - 10 files changed, 9 insertions(+), 13 deletions(-) diff --git a/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingServlet.java b/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingServlet.java index 3cb4d46f6b..cbf273bff9 100644 --- a/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingServlet.java +++ b/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingServlet.java @@ -222,7 +222,7 @@ public class HttpTunnelingServlet extends HttpServlet { } @ChannelPipelineCoverage("one") - private final class OutboundConnectionHandler extends SimpleChannelUpstreamHandler { + private static final class OutboundConnectionHandler extends SimpleChannelUpstreamHandler { private final ServletOutputStream out; diff --git a/src/main/java/org/jboss/netty/example/proxy/HexDumpProxyInboundHandler.java b/src/main/java/org/jboss/netty/example/proxy/HexDumpProxyInboundHandler.java index 436b40c395..432c5618a1 100644 --- a/src/main/java/org/jboss/netty/example/proxy/HexDumpProxyInboundHandler.java +++ b/src/main/java/org/jboss/netty/example/proxy/HexDumpProxyInboundHandler.java @@ -103,7 +103,7 @@ public class HexDumpProxyInboundHandler extends SimpleChannelUpstreamHandler { } @ChannelPipelineCoverage("one") - private class OutboundHandler extends SimpleChannelUpstreamHandler { + private static class OutboundHandler extends SimpleChannelUpstreamHandler { private final Channel inboundChannel; diff --git a/src/main/java/org/jboss/netty/handler/codec/compression/ZlibEncoder.java b/src/main/java/org/jboss/netty/handler/codec/compression/ZlibEncoder.java index 6d9eb38ff6..19a3e34a49 100644 --- a/src/main/java/org/jboss/netty/handler/codec/compression/ZlibEncoder.java +++ b/src/main/java/org/jboss/netty/handler/codec/compression/ZlibEncoder.java @@ -241,7 +241,7 @@ public class ZlibEncoder extends OneToOneEncoder { if (evt != null) { ctx.sendDownstream(evt); } - return Channels.succeededFuture(evt.getChannel()); + return Channels.succeededFuture(ctx.getChannel()); } ChannelBuffer footer; diff --git a/src/main/java/org/jboss/netty/handler/codec/http/HttpContentEncoder.java b/src/main/java/org/jboss/netty/handler/codec/http/HttpContentEncoder.java index c8c76449cc..cc87a61e74 100644 --- a/src/main/java/org/jboss/netty/handler/codec/http/HttpContentEncoder.java +++ b/src/main/java/org/jboss/netty/handler/codec/http/HttpContentEncoder.java @@ -77,7 +77,8 @@ public abstract class HttpContentEncoder extends SimpleChannelHandler { if (acceptedEncoding == null) { acceptedEncoding = HttpHeaders.Values.IDENTITY; } - acceptEncodingQueue.offer(acceptedEncoding); + boolean offered = acceptEncodingQueue.offer(acceptedEncoding); + assert offered; ctx.sendUpstream(e); } diff --git a/src/main/java/org/jboss/netty/handler/stream/ChunkedWriteHandler.java b/src/main/java/org/jboss/netty/handler/stream/ChunkedWriteHandler.java index ef10da49dd..fd76610188 100644 --- a/src/main/java/org/jboss/netty/handler/stream/ChunkedWriteHandler.java +++ b/src/main/java/org/jboss/netty/handler/stream/ChunkedWriteHandler.java @@ -91,7 +91,9 @@ public class ChunkedWriteHandler implements ChannelUpstreamHandler, ChannelDowns return; } - queue.offer((MessageEvent) e); + boolean offered = queue.offer((MessageEvent) e); + assert offered; + if (ctx.getChannel().isWritable()) { flush(ctx); } diff --git a/src/main/java/org/jboss/netty/util/internal/jzlib/Deflate.java b/src/main/java/org/jboss/netty/util/internal/jzlib/Deflate.java index 9738647c8c..f6615d263d 100644 --- a/src/main/java/org/jboss/netty/util/internal/jzlib/Deflate.java +++ b/src/main/java/org/jboss/netty/util/internal/jzlib/Deflate.java @@ -138,7 +138,6 @@ final class Deflate { WrapperType wrapperType; private boolean wroteTrailer; byte data_type; // UNKNOWN, BINARY or ASCII - byte method; // STORED (for zip only) or DEFLATED int last_flush; // value of flush param for previous deflate call int w_size; // LZ77 window size (32K by default) int w_bits; // log2(w_size) (8..16) @@ -1196,7 +1195,7 @@ final class Deflate { } if (match_available != 0) { - bflush = _tr_tally(0, window[strstart - 1] & 0xff); + _tr_tally(0, window[strstart - 1] & 0xff); match_available = 0; } flush_block_only(flush == JZlib.Z_FINISH); @@ -1363,7 +1362,6 @@ final class Deflate { //System.out.println("level="+level); this.strategy = strategy; - this.method = (byte) method; return deflateReset(strm); } @@ -1371,7 +1369,6 @@ final class Deflate { private int deflateReset(ZStream strm) { strm.total_in = strm.total_out = 0; strm.msg = null; // - strm.data_type = Z_UNKNOWN; pending = 0; pending_out = 0; diff --git a/src/main/java/org/jboss/netty/util/internal/jzlib/InfBlocks.java b/src/main/java/org/jboss/netty/util/internal/jzlib/InfBlocks.java index 6d740789c9..f3082d2fdf 100644 --- a/src/main/java/org/jboss/netty/util/internal/jzlib/InfBlocks.java +++ b/src/main/java/org/jboss/netty/util/internal/jzlib/InfBlocks.java @@ -566,7 +566,6 @@ final class InfBlocks { write = q; r = inflate_flush(z, r); q = write; - m = q < read? read - q - 1 : end - q; if (read != write) { bitb = b; bitk = k; diff --git a/src/main/java/org/jboss/netty/util/internal/jzlib/InfCodes.java b/src/main/java/org/jboss/netty/util/internal/jzlib/InfCodes.java index 1f5b49d2e1..f382e627f6 100644 --- a/src/main/java/org/jboss/netty/util/internal/jzlib/InfCodes.java +++ b/src/main/java/org/jboss/netty/util/internal/jzlib/InfCodes.java @@ -409,7 +409,6 @@ final class InfCodes { s.write = q; r = s.inflate_flush(z, r); q = s.write; - m = q < s.read? s.read - q - 1 : s.end - q; if (s.read != s.write) { s.bitb = b; diff --git a/src/main/java/org/jboss/netty/util/internal/jzlib/Inflate.java b/src/main/java/org/jboss/netty/util/internal/jzlib/Inflate.java index fe345101a1..32f667643d 100644 --- a/src/main/java/org/jboss/netty/util/internal/jzlib/Inflate.java +++ b/src/main/java/org/jboss/netty/util/internal/jzlib/Inflate.java @@ -252,7 +252,6 @@ final class Inflate { if (z.avail_in == 0) { return r; } - r = f; z.avail_in --; z.total_in ++; diff --git a/src/main/java/org/jboss/netty/util/internal/jzlib/ZStream.java b/src/main/java/org/jboss/netty/util/internal/jzlib/ZStream.java index 12b2372f9a..17a9bd4034 100644 --- a/src/main/java/org/jboss/netty/util/internal/jzlib/ZStream.java +++ b/src/main/java/org/jboss/netty/util/internal/jzlib/ZStream.java @@ -63,7 +63,6 @@ public final class ZStream { public String msg; Deflate dstate; Inflate istate; - int data_type; // best guess about the data type: ascii or binary long adler; int crc32;