From c93f5afa99c74e1a03cb19ccd198887f6e4003e2 Mon Sep 17 00:00:00 2001
From: Norman Maurer <nmaurer@redhat.com>
Date: Wed, 20 Feb 2013 12:52:55 +0100
Subject: [PATCH] [#1012] Cleanup

---
 NOTICE.txt                                    |  8 ------
 .../handler/codec/compression/JZlibTest.java  |  8 +-----
 license/LICENSE.jzlib.txt                     | 26 -------------------
 3 files changed, 1 insertion(+), 41 deletions(-)
 delete mode 100644 license/LICENSE.jzlib.txt

diff --git a/NOTICE.txt b/NOTICE.txt
index e7ba8f507b..511d0db538 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -42,14 +42,6 @@ Base64 Encoder and Decoder, which can be obtained at:
   * HOMEPAGE:
     * http://iharder.sourceforge.net/current/java/base64/
 
-This product contains a modified version of 'JZlib', a re-implementation of
-zlib in pure Java, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.jzlib.txt (BSD Style License)
-  * HOMEPAGE:
-    * http://www.jcraft.com/jzlib/
-
 This product contains a modified portion of 'Webbit', an event based  
 WebSocket and HTTP server, which can be obtained at:
 
diff --git a/codec/src/test/java/io/netty/handler/codec/compression/JZlibTest.java b/codec/src/test/java/io/netty/handler/codec/compression/JZlibTest.java
index 3176133117..4820e82fb9 100644
--- a/codec/src/test/java/io/netty/handler/codec/compression/JZlibTest.java
+++ b/codec/src/test/java/io/netty/handler/codec/compression/JZlibTest.java
@@ -25,10 +25,6 @@ import static org.junit.Assert.*;
 
 public class JZlibTest {
 
-    @After
-    public void resetSnappy() {
-    }
-
     @Test
     public void testZLIB() throws Exception {
         ByteBuf data = Unpooled.wrappedBuffer("test".getBytes());
@@ -118,9 +114,7 @@ public class JZlibTest {
           assertEquals(data, chDecoder.readInbound());
         }
 
-
-	// This case will be failed with netty's jzlib.
-      {
+       {
           EmbeddedByteChannel chDecoder =
             new EmbeddedByteChannel(new JZlibDecoder(ZlibWrapper.ZLIB_OR_NONE));
 
diff --git a/license/LICENSE.jzlib.txt b/license/LICENSE.jzlib.txt
deleted file mode 100644
index 29ad562af0..0000000000
--- a/license/LICENSE.jzlib.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-Copyright (c) 2000,2001,2002,2003,2004 ymnk, JCraft,Inc. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-  1. Redistributions of source code must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-
-  2. Redistributions in binary form must reproduce the above copyright 
-     notice, this list of conditions and the following disclaimer in 
-     the documentation and/or other materials provided with the distribution.
-
-  3. The names of the authors may not be used to endorse or promote products
-     derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
-INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
-OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-