Repository: camel Updated Branches: refs/heads/master 8fbf39613 -> d01138809
[CAMEL-9228] Update to undertow-1.3.0 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d0113880 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d0113880 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d0113880 Branch: refs/heads/master Commit: d01138809efed863aa3bb575b38078075cbe1a57 Parents: 8fbf396 Author: Thomas Diesler <[email protected]> Authored: Thu Oct 15 14:05:55 2015 +0200 Committer: Claus Ibsen <[email protected]> Committed: Mon Oct 19 07:38:12 2015 +0200 ---------------------------------------------------------------------- .../undertow/DefaultUndertowHttpBinding.java | 17 ++++++++++------- .../camel/component/undertow/UndertowProducer.java | 3 ++- parent/pom.xml | 2 +- 3 files changed, 13 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/d0113880/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/DefaultUndertowHttpBinding.java ---------------------------------------------------------------------- diff --git a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/DefaultUndertowHttpBinding.java b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/DefaultUndertowHttpBinding.java index d5825f4..7daa598 100644 --- a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/DefaultUndertowHttpBinding.java +++ b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/DefaultUndertowHttpBinding.java @@ -28,6 +28,8 @@ import java.util.Map; import io.undertow.client.ClientExchange; import io.undertow.client.ClientRequest; import io.undertow.client.ClientResponse; +import io.undertow.connector.ByteBufferPool; +import io.undertow.connector.PooledByteBuffer; import io.undertow.server.HttpServerExchange; import io.undertow.util.Headers; import io.undertow.util.HttpString; @@ -43,7 +45,6 @@ import org.apache.camel.util.MessageHelper; import org.apache.camel.util.ObjectHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.xnio.Pooled; /** * DefaultUndertowHttpBinding represent binding used by default, if user doesn't provide any. @@ -300,8 +301,9 @@ public class DefaultUndertowHttpBinding implements UndertowHttpBinding { } private byte[] readRequestBody(HttpServerExchange httpExchange) throws IOException { - Pooled<ByteBuffer> pooledByteBuffer = httpExchange.getConnection().getBufferPool().allocate(); - ByteBuffer byteBuffer = pooledByteBuffer.getResource(); + ByteBufferPool bufferPool = httpExchange.getConnection().getByteBufferPool(); + PooledByteBuffer pooledByteBuffer = bufferPool.allocate(); + ByteBuffer byteBuffer = pooledByteBuffer.getBuffer(); byteBuffer.clear(); @@ -312,13 +314,14 @@ public class DefaultUndertowHttpBinding implements UndertowHttpBinding { byteBuffer.get(bytes); byteBuffer.clear(); - pooledByteBuffer.free(); + pooledByteBuffer.close(); return bytes; } private byte[] readResponseBody(ClientExchange httpExchange) throws IOException { - Pooled<ByteBuffer> pooledByteBuffer = httpExchange.getConnection().getBufferPool().allocate(); - ByteBuffer byteBuffer = pooledByteBuffer.getResource(); + ByteBufferPool bufferPool = httpExchange.getConnection().getBufferPool(); + PooledByteBuffer pooledByteBuffer = bufferPool.allocate(); + ByteBuffer byteBuffer = pooledByteBuffer.getBuffer(); byteBuffer.clear(); @@ -329,7 +332,7 @@ public class DefaultUndertowHttpBinding implements UndertowHttpBinding { byteBuffer.get(bytes); byteBuffer.clear(); - pooledByteBuffer.free(); + pooledByteBuffer.close(); return bytes; } http://git-wip-us.apache.org/repos/asf/camel/blob/d0113880/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowProducer.java b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowProducer.java index 0d1ba75..8e13e52 100644 --- a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowProducer.java +++ b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowProducer.java @@ -25,6 +25,7 @@ import io.undertow.client.ClientConnection; import io.undertow.client.ClientExchange; import io.undertow.client.ClientRequest; import io.undertow.client.UndertowClient; +import io.undertow.server.XnioByteBufferPool; import io.undertow.util.Headers; import io.undertow.util.HttpString; import io.undertow.util.Protocols; @@ -76,7 +77,7 @@ public class UndertowProducer extends DefaultAsyncProducer { try { final UndertowClient client = UndertowClient.getInstance(); - IoFuture<ClientConnection> connect = client.connect(endpoint.getHttpURI(), worker, pool, options); + IoFuture<ClientConnection> connect = client.connect(endpoint.getHttpURI(), worker, new XnioByteBufferPool(pool), options); // creating the url to use takes 2-steps String url = UndertowHelper.createURL(exchange, getEndpoint()); http://git-wip-us.apache.org/repos/asf/camel/blob/d0113880/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index f382a92..effeabb 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -505,7 +505,7 @@ <testng-version>6.8.21</testng-version> <twitter4j-bundle-version>4.0.4_1</twitter4j-bundle-version> <twitter4j-version>4.0.4</twitter4j-version> - <undertow-version>1.2.12.Final</undertow-version> + <undertow-version>1.3.0.Final</undertow-version> <univocity-parsers-version>1.5.6</univocity-parsers-version> <unix-socket-factory-version>2015-01-27T15-02-14</unix-socket-factory-version> <unix-socket-factory-bundle-version>1.0.0</unix-socket-factory-bundle-version>
