[camel] branch master updated: CAMEL-14098 - Camel-netty-http: Update to fix the issue when populate the http request headers (#3280)

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new a3ebca6  CAMEL-14098 - Camel-netty-http: Update to fix the issue when populate the http request headers (#3280)
a3ebca6 is described below

commit a3ebca6f9527a22d0823c9c2d75ef3587b95951e
Author: Amos Feng <zf...@redhat.com>
AuthorDate: Fri Oct 25 12:16:08 2019 +0800

    CAMEL-14098 - Camel-netty-http: Update to fix the issue when populate the http request headers (#3280)
---
 .../netty/http/DefaultNettyHttpBinding.java        |  2 +-
 .../netty/http/NettyHttpPostDataTest.java          | 53 ++++++++++++++++++++++
 2 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/DefaultNettyHttpBinding.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/DefaultNettyHttpBinding.java
index 7c1db0a..6e9fd65 100644
--- a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/DefaultNettyHttpBinding.java
+++ b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/DefaultNettyHttpBinding.java
@@ -255,7 +255,7 @@ public class DefaultNettyHttpBinding implements NettyHttpBinding, Cloneable {
 
             // Push POST form params into the headers to retain compatibility with DefaultHttpBinding
             String body;
-            ByteBuf buffer = ((FullHttpRequest)request).content();
+            ByteBuf buffer = ((FullHttpRequest)request).content().retain();
             try {
                 body = buffer.toString(Charset.forName(charset));
             } finally {
diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpPostDataTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpPostDataTest.java
new file mode 100644
index 0000000..0fc5016
--- /dev/null
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpPostDataTest.java
@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF 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.apache.camel.component.netty.http;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.support.DefaultExchange;
+import org.junit.Test;
+
+public class NettyHttpPostDataTest extends BaseNettyTest {
+    @Test
+    public void testPostWWWFormUrlencoded() throws Exception {
+        String body = "x=1&y=2";
+        getMockEndpoint("mock:input").expectedBodiesReceived(body);
+
+        DefaultExchange exchange = new DefaultExchange(context);
+
+        exchange.getIn().setHeader(Exchange.CONTENT_TYPE, NettyHttpConstants.CONTENT_TYPE_WWW_FORM_URLENCODED);
+        exchange.getIn().setBody(body);
+
+        Exchange result = template.send("netty-http:http://localhost:{{port}}/foo", exchange);
+
+        assertFalse(result.isFailed());
+        assertEquals("expect the x is 1", "1", result.getIn().getHeader("x", String.class));
+        assertEquals("expect the y is 2", "2", result.getIn().getHeader("y", String.class));
+        assertMockEndpointsSatisfied();
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                from("netty-http:http://0.0.0.0:{{port}}/foo")
+                        .to("mock:input");
+            }
+        };
+    }
+}