You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2013/08/08 02:44:50 UTC

git commit: CAMEL-6617 fixed the issue of RabbitMQConsumer doesn't put the body into message

Updated Branches:
  refs/heads/master b36127fcf -> 7535b96c6


CAMEL-6617 fixed the issue of RabbitMQConsumer doesn't put the body into message


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7535b96c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7535b96c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7535b96c

Branch: refs/heads/master
Commit: 7535b96c61811eedc6ee26c16151a0b92a08fe45
Parents: b36127f
Author: Willem Jiang <ni...@apache.org>
Authored: Thu Aug 8 08:43:50 2013 +0800
Committer: Willem Jiang <ni...@apache.org>
Committed: Thu Aug 8 08:43:50 2013 +0800

----------------------------------------------------------------------
 .../org/apache/camel/component/rabbitmq/RabbitMQConsumer.java     | 2 +-
 .../org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java     | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/7535b96c/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConsumer.java b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConsumer.java
index 0927f81..7ae8d12 100644
--- a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConsumer.java
+++ b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConsumer.java
@@ -114,7 +114,7 @@ public class RabbitMQConsumer extends DefaultConsumer {
                                    AMQP.BasicProperties properties,
                                    byte[] body) throws IOException {
 
-            Exchange exchange = consumer.endpoint.createRabbitExchange(envelope);
+            Exchange exchange = consumer.endpoint.createRabbitExchange(envelope, body);
             log.trace("Created exchange [exchange={}]", new Object[]{exchange});
 
             try {

http://git-wip-us.apache.org/repos/asf/camel/blob/7535b96c/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java
index 2a7e2d6..ffb8515 100644
--- a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java
+++ b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java
@@ -56,7 +56,7 @@ public class RabbitMQEndpoint extends DefaultEndpoint {
         super(endpointUri, component);
     }
 
-    public Exchange createRabbitExchange(Envelope envelope) {
+    public Exchange createRabbitExchange(Envelope envelope, byte[] body) {
         Exchange exchange = new DefaultExchange(getCamelContext(), getExchangePattern());
 
         Message message = new DefaultMessage();
@@ -65,6 +65,7 @@ public class RabbitMQEndpoint extends DefaultEndpoint {
         message.setHeader(RabbitMQConstants.ROUTING_KEY, envelope.getRoutingKey());
         message.setHeader(RabbitMQConstants.EXCHANGE_NAME, envelope.getExchange());
         message.setHeader(RabbitMQConstants.DELIVERY_TAG, envelope.getDeliveryTag());
+        message.setBody(body);
 
         return exchange;
     }

Re: git commit: CAMEL-6617 fixed the issue of RabbitMQConsumer doesn't put the body into message

Posted by Willem jiang <wi...@gmail.com>.
Sorry, I will commit a quick fix for it shortly.


--  
Willem Jiang

Red Hat, Inc.
FuseSource is now part of Red Hat
Web: http://www.fusesource.com | http://www.redhat.com
Blog: http://willemjiang.blogspot.com (http://willemjiang.blogspot.com/) (English)
          http://jnn.iteye.com (http://jnn.javaeye.com/) (Chinese)
Twitter: willemjiang  
Weibo: 姜宁willem





On Thursday, August 8, 2013 at 3:21 PM, Claus Ibsen wrote:

> I get a compilation error with latest code from master
>  
> [INFO] ------------------------------------------------------------------------
> [INFO] BUILD FAILURE
> [INFO] ------------------------------------------------------------------------
> [INFO] Total time: 12:48.409s
> [INFO] Finished at: Thu Aug 08 09:01:31 CEST 2013
> [INFO] Final Memory: 259M/977M
> [INFO] ------------------------------------------------------------------------
> [ERROR] Failed to execute goal
> org.apache.maven.plugins:maven-compiler-plugin:2.5.1:testCompile
> (default-testCompile) on project camel-rabbitmq: Compilation failure
> [ERROR] /Users/davsclaus/workspace/camel/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQEndpointTest.java:[44,36]
> error: method createRabbitExchange in class RabbitMQEndpoint cannot be
> applied to given types;
> [ERROR] -> [Help 1]
>  
> On Thu, Aug 8, 2013 at 2:44 AM, <ningjiang@apache.org (mailto:ningjiang@apache.org)> wrote:
> > Updated Branches:
> > refs/heads/master b36127fcf -> 7535b96c6
> >  
> >  
> > CAMEL-6617 fixed the issue of RabbitMQConsumer doesn't put the body into message
> >  
> >  
> > Project: http://git-wip-us.apache.org/repos/asf/camel/repo
> > Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7535b96c
> > Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7535b96c
> > Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7535b96c
> >  
> > Branch: refs/heads/master
> > Commit: 7535b96c61811eedc6ee26c16151a0b92a08fe45
> > Parents: b36127f
> > Author: Willem Jiang <ningjiang@apache.org (mailto:ningjiang@apache.org)>
> > Authored: Thu Aug 8 08:43:50 2013 +0800
> > Committer: Willem Jiang <ningjiang@apache.org (mailto:ningjiang@apache.org)>
> > Committed: Thu Aug 8 08:43:50 2013 +0800
> >  
> > ----------------------------------------------------------------------
> > .../org/apache/camel/component/rabbitmq/RabbitMQConsumer.java | 2 +-
> > .../org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java | 3 ++-
> > 2 files changed, 3 insertions(+), 2 deletions(-)
> > ----------------------------------------------------------------------
> >  
> >  
> > http://git-wip-us.apache.org/repos/asf/camel/blob/7535b96c/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConsumer.java
> > ----------------------------------------------------------------------
> > diff --git a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConsumer.java b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConsumer.java
> > index 0927f81..7ae8d12 100644
> > --- a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConsumer.java
> > +++ b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConsumer.java
> > @@ -114,7 +114,7 @@ public class RabbitMQConsumer extends DefaultConsumer {
> > AMQP.BasicProperties properties,
> > byte[] body) throws IOException {
> >  
> > - Exchange exchange = consumer.endpoint.createRabbitExchange(envelope);
> > + Exchange exchange = consumer.endpoint.createRabbitExchange(envelope, body);
> > log.trace("Created exchange [exchange={}]", new Object[]{exchange});
> >  
> > try {
> >  
> > http://git-wip-us.apache.org/repos/asf/camel/blob/7535b96c/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java
> > ----------------------------------------------------------------------
> > diff --git a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java
> > index 2a7e2d6..ffb8515 100644
> > --- a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java
> > +++ b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java
> > @@ -56,7 +56,7 @@ public class RabbitMQEndpoint extends DefaultEndpoint {
> > super(endpointUri, component);
> > }
> >  
> > - public Exchange createRabbitExchange(Envelope envelope) {
> > + public Exchange createRabbitExchange(Envelope envelope, byte[] body) {
> > Exchange exchange = new DefaultExchange(getCamelContext(), getExchangePattern());
> >  
> > Message message = new DefaultMessage();
> > @@ -65,6 +65,7 @@ public class RabbitMQEndpoint extends DefaultEndpoint {
> > message.setHeader(RabbitMQConstants.ROUTING_KEY, envelope.getRoutingKey());
> > message.setHeader(RabbitMQConstants.EXCHANGE_NAME, envelope.getExchange());
> > message.setHeader(RabbitMQConstants.DELIVERY_TAG, envelope.getDeliveryTag());
> > + message.setBody(body);
> >  
> > return exchange;
> > }
>  
>  
>  
>  
>  
> --  
> Claus Ibsen
> -----------------
> Red Hat, Inc.
> Email: cibsen@redhat.com (mailto:cibsen@redhat.com)
> Twitter: davsclaus
> Blog: http://davsclaus.com
> Author of Camel in Action: http://www.manning.com/ibsen

Re: git commit: CAMEL-6617 fixed the issue of RabbitMQConsumer doesn't put the body into message

Posted by Claus Ibsen <cl...@gmail.com>.
I get a compilation error with latest code from master

[INFO] ------------------------------------------------------------------------
[INFO] BUILD FAILURE
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 12:48.409s
[INFO] Finished at: Thu Aug 08 09:01:31 CEST 2013
[INFO] Final Memory: 259M/977M
[INFO] ------------------------------------------------------------------------
[ERROR] Failed to execute goal
org.apache.maven.plugins:maven-compiler-plugin:2.5.1:testCompile
(default-testCompile) on project camel-rabbitmq: Compilation failure
[ERROR] /Users/davsclaus/workspace/camel/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQEndpointTest.java:[44,36]
error: method createRabbitExchange in class RabbitMQEndpoint cannot be
applied to given types;
[ERROR] -> [Help 1]

On Thu, Aug 8, 2013 at 2:44 AM,  <ni...@apache.org> wrote:
> Updated Branches:
>   refs/heads/master b36127fcf -> 7535b96c6
>
>
> CAMEL-6617 fixed the issue of RabbitMQConsumer doesn't put the body into message
>
>
> Project: http://git-wip-us.apache.org/repos/asf/camel/repo
> Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7535b96c
> Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7535b96c
> Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7535b96c
>
> Branch: refs/heads/master
> Commit: 7535b96c61811eedc6ee26c16151a0b92a08fe45
> Parents: b36127f
> Author: Willem Jiang <ni...@apache.org>
> Authored: Thu Aug 8 08:43:50 2013 +0800
> Committer: Willem Jiang <ni...@apache.org>
> Committed: Thu Aug 8 08:43:50 2013 +0800
>
> ----------------------------------------------------------------------
>  .../org/apache/camel/component/rabbitmq/RabbitMQConsumer.java     | 2 +-
>  .../org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java     | 3 ++-
>  2 files changed, 3 insertions(+), 2 deletions(-)
> ----------------------------------------------------------------------
>
>
> http://git-wip-us.apache.org/repos/asf/camel/blob/7535b96c/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConsumer.java
> ----------------------------------------------------------------------
> diff --git a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConsumer.java b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConsumer.java
> index 0927f81..7ae8d12 100644
> --- a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConsumer.java
> +++ b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConsumer.java
> @@ -114,7 +114,7 @@ public class RabbitMQConsumer extends DefaultConsumer {
>                                     AMQP.BasicProperties properties,
>                                     byte[] body) throws IOException {
>
> -            Exchange exchange = consumer.endpoint.createRabbitExchange(envelope);
> +            Exchange exchange = consumer.endpoint.createRabbitExchange(envelope, body);
>              log.trace("Created exchange [exchange={}]", new Object[]{exchange});
>
>              try {
>
> http://git-wip-us.apache.org/repos/asf/camel/blob/7535b96c/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java
> ----------------------------------------------------------------------
> diff --git a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java
> index 2a7e2d6..ffb8515 100644
> --- a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java
> +++ b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java
> @@ -56,7 +56,7 @@ public class RabbitMQEndpoint extends DefaultEndpoint {
>          super(endpointUri, component);
>      }
>
> -    public Exchange createRabbitExchange(Envelope envelope) {
> +    public Exchange createRabbitExchange(Envelope envelope, byte[] body) {
>          Exchange exchange = new DefaultExchange(getCamelContext(), getExchangePattern());
>
>          Message message = new DefaultMessage();
> @@ -65,6 +65,7 @@ public class RabbitMQEndpoint extends DefaultEndpoint {
>          message.setHeader(RabbitMQConstants.ROUTING_KEY, envelope.getRoutingKey());
>          message.setHeader(RabbitMQConstants.EXCHANGE_NAME, envelope.getExchange());
>          message.setHeader(RabbitMQConstants.DELIVERY_TAG, envelope.getDeliveryTag());
> +        message.setBody(body);
>
>          return exchange;
>      }
>



-- 
Claus Ibsen
-----------------
Red Hat, Inc.
Email: cibsen@redhat.com
Twitter: davsclaus
Blog: http://davsclaus.com
Author of Camel in Action: http://www.manning.com/ibsen