Merge branch '3' of github.com:netty/netty into 3

.gitignore

@@ -8,3 +8,4 @@
 /*.ipr
 /*.iws
 /.metadata
+/.idea/

src/main/java/org/jboss/netty/buffer/CompositeChannelBuffer.java

@@ -508,13 +508,18 @@ public class CompositeChannelBuffer extends AbstractChannelBuffer {
             int localLength = Math.min(length, s.capacity() - (index - adjustment));
             int localReadBytes = s.setBytes(index - adjustment, in, localLength);
 
-            if (localReadBytes <= 0) {
+            if (localReadBytes == 0) {
-                if (readBytes == 0) {
-                    readBytes = localReadBytes;
-                }
                 break;
             }
 
+            if (localReadBytes < 0) {
+                if (readBytes == 0) {
+                    return -1;
+                } else {
+                    break;
+                }
+            }
+
             if (localReadBytes == localLength) {
                 index += localLength;
                 length -= localLength;

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

@@ -124,11 +124,7 @@ public abstract class HttpMessageEncoder extends OneToOneEncoder {
                             wrappedBuffer(CRLF));
                 }
             } else {
-                if (chunk.isLast()) {
+                return chunk.getContent();
-                    return null;
-                } else {
-                    return chunk.getContent();
-                }
             }
 
         }

src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketServerHandshaker.java

@@ -15,6 +15,7 @@
  */
 package org.jboss.netty.handler.codec.http.websocketx;
 
+import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
@@ -112,9 +113,7 @@ public abstract class WebSocketServerHandshaker {
      */
     public Set<String> getSubprotocols() {
         Set<String> ret = new LinkedHashSet<String>();
-        for (String p : subprotocols) {
+        Collections.addAll(ret, subprotocols);
-            ret.add(p);
-        }
         return ret;
     }
 

src/main/java/org/jboss/netty/handler/ipfilter/CIDR6.java

@@ -155,9 +155,7 @@ public class CIDR6 extends CIDR {
         } else {
             // copy the address into a 16 byte array, zero-filled.
             int p = 16 - b.length;
-            for (int i = 0; i < b.length; i++) {
+            System.arraycopy(b, 0, a, p + 0, b.length);
-                a[p + i] = b[i];
-            }
         }
         return InetAddress.getByAddress(a);
     }

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

@@ -0,0 +1,42 @@
+/*
+ * Copyright 2012 The Netty Project
+ *
+ * The Netty Project 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 static org.junit.Assert.*;
+
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.handler.codec.embedder.EncoderEmbedder;
+import org.junit.Test;
+
+public class HttpMessageEncoderTest {
+
+    // Test for #493
+    @Test
+    public void testHttpChunkIsLast() {
+        EncoderEmbedder<ChannelBuffer> encoder = new EncoderEmbedder<ChannelBuffer>(new HttpMessageEncoder() {
+
+            @Override
+            protected void encodeInitialLine(ChannelBuffer buf, HttpMessage message) throws Exception {
+                // do nothing
+            }
+            
+        });
+        assertTrue(encoder.offer(HttpChunk.LAST_CHUNK));
+        assertTrue(encoder.finish());
+        assertNotNull(encoder.poll());
+        assertNull(encoder.poll());
+    }
+}