* Fixed dangling HTTP header entries in the linked list

* Added a test case

src/main/java/org/jboss/netty/handler/codec/http/HttpHeaders.java

@@ -659,13 +659,13 @@ public class HttpHeaders {
 
         for (;;) {
             if (e.hash == h && eq(name, e.key)) {
+                e.remove();
                 Entry next = e.next;
                 if (next != null) {
                     entries[i] = next;
                     e = next;
                 } else {
                     entries[i] = null;
-                    e.remove();
                     return;
                 }
             } else {
@@ -839,5 +839,10 @@ public class HttpHeaders {
             this.value = value;
             return oldValue;
         }
+
+        @Override
+        public String toString() {
+            return key + "=" + value;
+        }
     }
 }

src/test/java/org/jboss/netty/handler/codec/http/DefaultHttpMessageTest.java

@@ -0,0 +1,50 @@
+/*
+ * Copyright 2009 Red Hat, Inc.
+ *
+ * Red Hat licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at:
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+package org.jboss.netty.handler.codec.http;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * @author <a href="http://www.jboss.org/netty/">The Netty Project</a>
+ * @author <a href="http://gleamynode.net/">Trustin Lee</a>
+ * @version $Rev$, $Date$
+ */
+public class DefaultHttpMessageTest {
+
+    @Test
+    public void testHeaderRemoval() {
+        HttpMessage m = new DefaultHttpRequest(
+                HttpVersion.HTTP_1_1, HttpMethod.GET, "/");
+
+        // Insert sample keys.
+        for (int i = 0; i < 1000; i ++) {
+            m.setHeader(String.valueOf(i), "");
+        }
+
+        // Remove in reversed order.
+        for (int i = 999; i >= 0; i --) {
+            m.removeHeader(String.valueOf(i));
+        }
+
+        // Check if random access returns nothing.
+        for (int i = 0; i < 1000; i ++) {
+            Assert.assertNull(m.getHeader(String.valueOf(i)));
+        }
+
+        Assert.assertTrue(m.getHeaders().isEmpty());
+    }
+}