You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2013/09/18 11:20:45 UTC
[1/6] git commit: CAMEL-6730: Fixed requestTimeout on camel-netty.
Updated Branches:
refs/heads/camel-2.11.x 690344774 -> 79be93274
refs/heads/camel-2.12.x 111ba6a6b -> f63a7698a
refs/heads/master 053437df4 -> f10041566
CAMEL-6730: Fixed requestTimeout on camel-netty.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/cc99d3e8
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cc99d3e8
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cc99d3e8
Branch: refs/heads/master
Commit: cc99d3e82531fe0c538ca6fde20b3e14b01634a6
Parents: 053437d
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Sep 18 11:18:05 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Sep 18 11:18:05 2013 +0200
----------------------------------------------------------------------
.../netty/handlers/ClientChannelHandler.java | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/cc99d3e8/components/camel-netty/src/main/java/org/apache/camel/component/netty/handlers/ClientChannelHandler.java
----------------------------------------------------------------------
diff --git a/components/camel-netty/src/main/java/org/apache/camel/component/netty/handlers/ClientChannelHandler.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty/handlers/ClientChannelHandler.java
index b55f4b7..b830c95 100644
--- a/components/camel-netty/src/main/java/org/apache/camel/component/netty/handlers/ClientChannelHandler.java
+++ b/components/camel-netty/src/main/java/org/apache/camel/component/netty/handlers/ClientChannelHandler.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.component.netty.handlers;
+import java.util.List;
+
import org.apache.camel.AsyncCallback;
import org.apache.camel.CamelExchangeException;
import org.apache.camel.Exchange;
@@ -26,11 +28,13 @@ import org.apache.camel.component.netty.NettyHelper;
import org.apache.camel.component.netty.NettyPayloadHelper;
import org.apache.camel.component.netty.NettyProducer;
import org.apache.camel.util.ExchangeHelper;
+import org.jboss.netty.channel.ChannelHandler;
import org.jboss.netty.channel.ChannelHandlerContext;
import org.jboss.netty.channel.ChannelStateEvent;
import org.jboss.netty.channel.ExceptionEvent;
import org.jboss.netty.channel.MessageEvent;
import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
+import org.jboss.netty.handler.timeout.ReadTimeoutHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -120,17 +124,20 @@ public class ClientChannelHandler extends SimpleChannelUpstreamHandler {
@Override
public void messageReceived(ChannelHandlerContext ctx, MessageEvent messageEvent) throws Exception {
+ messageReceived = true;
+
if (LOG.isTraceEnabled()) {
LOG.trace("Message received: {}", messageEvent);
}
if (producer.getConfiguration().getRequestTimeout() > 0) {
- LOG.trace("Removing timeout channel as we received message");
- ctx.getPipeline().remove("timeout");
+ ChannelHandler handler = ctx.getPipeline().get("timeout");
+ if (handler != null) {
+ LOG.trace("Removing timeout channel as we received message");
+ ctx.getPipeline().remove(handler);
+ }
}
- messageReceived = true;
-
Exchange exchange = getExchange(ctx);
AsyncCallback callback = getAsyncCallback(ctx);
[4/6] git commit: CAMEL-6764: camel-jms - Add workaround for AMQ to
get JMSXUserID
Posted by da...@apache.org.
CAMEL-6764: camel-jms - Add workaround for AMQ to get JMSXUserID
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f63a7698
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f63a7698
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f63a7698
Branch: refs/heads/camel-2.12.x
Commit: f63a7698a736b6be1657b7257323cc8fd360a876
Parents: e6326d9
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Sep 18 11:19:16 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Sep 18 11:19:41 2013 +0200
----------------------------------------------------------------------
.../apache/camel/component/jms/JmsBinding.java | 3 ++-
.../camel/component/jms/JmsMessageHelper.java | 18 +++++++++++++++++-
2 files changed, 19 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/f63a7698/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
----------------------------------------------------------------------
diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
index b34479e..9cb393a 100644
--- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
+++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
@@ -170,6 +170,7 @@ public class JmsBinding {
// this works around a bug in the ActiveMQ property handling
map.put("JMSXGroupID", jmsMessage.getStringProperty("JMSXGroupID"));
+ map.put("JMSXUserID", jmsMessage.getStringProperty("JMSXUserID"));
} catch (JMSException e) {
throw new RuntimeCamelException(e);
}
@@ -183,7 +184,7 @@ public class JmsBinding {
while (names.hasMoreElements()) {
String name = names.nextElement().toString();
try {
- Object value = jmsMessage.getObjectProperty(name);
+ Object value = JmsMessageHelper.getProperty(jmsMessage, name);
if (headerFilterStrategy != null
&& headerFilterStrategy.applyFilterToExternalHeaders(name, value, exchange)) {
continue;
http://git-wip-us.apache.org/repos/asf/camel/blob/f63a7698/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessageHelper.java
----------------------------------------------------------------------
diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessageHelper.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessageHelper.java
index 89c60dc..8b8f15b 100644
--- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessageHelper.java
+++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessageHelper.java
@@ -70,7 +70,7 @@ public final class JmsMessageHelper {
if (name.equals(key)) {
answer = key;
} else {
- map.put(key, jmsMessage.getObjectProperty(key));
+ map.put(key, getProperty(jmsMessage, key));
}
}
@@ -103,6 +103,22 @@ public final class JmsMessageHelper {
}
/**
+ * Gets a JMS property
+ *
+ * @param jmsMessage the JMS message
+ * @param name name of the property to get
+ * @return the property value, or <tt>null</tt> if does not exists
+ * @throws JMSException can be thrown
+ */
+ public static Object getProperty(Message jmsMessage, String name) throws JMSException {
+ Object value = jmsMessage.getObjectProperty(name);
+ if (value == null) {
+ value = jmsMessage.getStringProperty(name);
+ }
+ return value;
+ }
+
+ /**
* Sets the property on the given JMS message.
*
* @param jmsMessage the JMS message
[6/6] git commit: CAMEL-6764: camel-jms - Add workaround for AMQ to
get JMSXUserID
Posted by da...@apache.org.
CAMEL-6764: camel-jms - Add workaround for AMQ to get JMSXUserID
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/79be9327
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/79be9327
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/79be9327
Branch: refs/heads/camel-2.11.x
Commit: 79be932746730b38c0732470873e705c2b77f2da
Parents: a84da60
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Sep 18 11:19:16 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Sep 18 11:20:11 2013 +0200
----------------------------------------------------------------------
.../apache/camel/component/jms/JmsBinding.java | 3 ++-
.../camel/component/jms/JmsMessageHelper.java | 18 +++++++++++++++++-
2 files changed, 19 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/79be9327/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
----------------------------------------------------------------------
diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
index ed666df..22fa523 100644
--- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
+++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
@@ -170,6 +170,7 @@ public class JmsBinding {
// this works around a bug in the ActiveMQ property handling
map.put("JMSXGroupID", jmsMessage.getStringProperty("JMSXGroupID"));
+ map.put("JMSXUserID", jmsMessage.getStringProperty("JMSXUserID"));
} catch (JMSException e) {
throw new RuntimeCamelException(e);
}
@@ -183,7 +184,7 @@ public class JmsBinding {
while (names.hasMoreElements()) {
String name = names.nextElement().toString();
try {
- Object value = jmsMessage.getObjectProperty(name);
+ Object value = JmsMessageHelper.getProperty(jmsMessage, name);
if (headerFilterStrategy != null
&& headerFilterStrategy.applyFilterToExternalHeaders(name, value, exchange)) {
continue;
http://git-wip-us.apache.org/repos/asf/camel/blob/79be9327/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessageHelper.java
----------------------------------------------------------------------
diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessageHelper.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessageHelper.java
index 89c60dc..8b8f15b 100644
--- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessageHelper.java
+++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessageHelper.java
@@ -70,7 +70,7 @@ public final class JmsMessageHelper {
if (name.equals(key)) {
answer = key;
} else {
- map.put(key, jmsMessage.getObjectProperty(key));
+ map.put(key, getProperty(jmsMessage, key));
}
}
@@ -103,6 +103,22 @@ public final class JmsMessageHelper {
}
/**
+ * Gets a JMS property
+ *
+ * @param jmsMessage the JMS message
+ * @param name name of the property to get
+ * @return the property value, or <tt>null</tt> if does not exists
+ * @throws JMSException can be thrown
+ */
+ public static Object getProperty(Message jmsMessage, String name) throws JMSException {
+ Object value = jmsMessage.getObjectProperty(name);
+ if (value == null) {
+ value = jmsMessage.getStringProperty(name);
+ }
+ return value;
+ }
+
+ /**
* Sets the property on the given JMS message.
*
* @param jmsMessage the JMS message
[3/6] git commit: CAMEL-6730: Fixed requestTimeout on camel-netty.
Posted by da...@apache.org.
CAMEL-6730: Fixed requestTimeout on camel-netty.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e6326d9c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e6326d9c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e6326d9c
Branch: refs/heads/camel-2.12.x
Commit: e6326d9c800984e5e38e788dbd48fc95d1aababd
Parents: 111ba6a
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Sep 18 11:18:05 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Sep 18 11:19:34 2013 +0200
----------------------------------------------------------------------
.../netty/handlers/ClientChannelHandler.java | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/e6326d9c/components/camel-netty/src/main/java/org/apache/camel/component/netty/handlers/ClientChannelHandler.java
----------------------------------------------------------------------
diff --git a/components/camel-netty/src/main/java/org/apache/camel/component/netty/handlers/ClientChannelHandler.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty/handlers/ClientChannelHandler.java
index b55f4b7..b830c95 100644
--- a/components/camel-netty/src/main/java/org/apache/camel/component/netty/handlers/ClientChannelHandler.java
+++ b/components/camel-netty/src/main/java/org/apache/camel/component/netty/handlers/ClientChannelHandler.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.component.netty.handlers;
+import java.util.List;
+
import org.apache.camel.AsyncCallback;
import org.apache.camel.CamelExchangeException;
import org.apache.camel.Exchange;
@@ -26,11 +28,13 @@ import org.apache.camel.component.netty.NettyHelper;
import org.apache.camel.component.netty.NettyPayloadHelper;
import org.apache.camel.component.netty.NettyProducer;
import org.apache.camel.util.ExchangeHelper;
+import org.jboss.netty.channel.ChannelHandler;
import org.jboss.netty.channel.ChannelHandlerContext;
import org.jboss.netty.channel.ChannelStateEvent;
import org.jboss.netty.channel.ExceptionEvent;
import org.jboss.netty.channel.MessageEvent;
import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
+import org.jboss.netty.handler.timeout.ReadTimeoutHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -120,17 +124,20 @@ public class ClientChannelHandler extends SimpleChannelUpstreamHandler {
@Override
public void messageReceived(ChannelHandlerContext ctx, MessageEvent messageEvent) throws Exception {
+ messageReceived = true;
+
if (LOG.isTraceEnabled()) {
LOG.trace("Message received: {}", messageEvent);
}
if (producer.getConfiguration().getRequestTimeout() > 0) {
- LOG.trace("Removing timeout channel as we received message");
- ctx.getPipeline().remove("timeout");
+ ChannelHandler handler = ctx.getPipeline().get("timeout");
+ if (handler != null) {
+ LOG.trace("Removing timeout channel as we received message");
+ ctx.getPipeline().remove(handler);
+ }
}
- messageReceived = true;
-
Exchange exchange = getExchange(ctx);
AsyncCallback callback = getAsyncCallback(ctx);
[5/6] git commit: CAMEL-6730: Fixed requestTimeout on camel-netty.
Posted by da...@apache.org.
CAMEL-6730: Fixed requestTimeout on camel-netty.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a84da605
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a84da605
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a84da605
Branch: refs/heads/camel-2.11.x
Commit: a84da605171cd87b7c7e52b5a1b294d7e0f3aafa
Parents: 6903447
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Sep 18 11:18:05 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Sep 18 11:20:02 2013 +0200
----------------------------------------------------------------------
.../netty/handlers/ClientChannelHandler.java | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/a84da605/components/camel-netty/src/main/java/org/apache/camel/component/netty/handlers/ClientChannelHandler.java
----------------------------------------------------------------------
diff --git a/components/camel-netty/src/main/java/org/apache/camel/component/netty/handlers/ClientChannelHandler.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty/handlers/ClientChannelHandler.java
index cd2f272..c58075b 100644
--- a/components/camel-netty/src/main/java/org/apache/camel/component/netty/handlers/ClientChannelHandler.java
+++ b/components/camel-netty/src/main/java/org/apache/camel/component/netty/handlers/ClientChannelHandler.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.component.netty.handlers;
+import java.util.List;
+
import org.apache.camel.AsyncCallback;
import org.apache.camel.CamelExchangeException;
import org.apache.camel.Exchange;
@@ -26,11 +28,13 @@ import org.apache.camel.component.netty.NettyHelper;
import org.apache.camel.component.netty.NettyPayloadHelper;
import org.apache.camel.component.netty.NettyProducer;
import org.apache.camel.util.ExchangeHelper;
+import org.jboss.netty.channel.ChannelHandler;
import org.jboss.netty.channel.ChannelHandlerContext;
import org.jboss.netty.channel.ChannelStateEvent;
import org.jboss.netty.channel.ExceptionEvent;
import org.jboss.netty.channel.MessageEvent;
import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
+import org.jboss.netty.handler.timeout.ReadTimeoutHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -120,17 +124,20 @@ public class ClientChannelHandler extends SimpleChannelUpstreamHandler {
@Override
public void messageReceived(ChannelHandlerContext ctx, MessageEvent messageEvent) throws Exception {
+ messageReceived = true;
+
if (LOG.isTraceEnabled()) {
LOG.trace("Message received: {}", messageEvent);
}
if (producer.getConfiguration().getRequestTimeout() > 0) {
- LOG.trace("Removing timeout channel as we received message");
- ctx.getPipeline().remove("timeout");
+ ChannelHandler handler = ctx.getPipeline().get("timeout");
+ if (handler != null) {
+ LOG.trace("Removing timeout channel as we received message");
+ ctx.getPipeline().remove(handler);
+ }
}
- messageReceived = true;
-
Exchange exchange = getExchange(ctx);
AsyncCallback callback = getAsyncCallback(ctx);
[2/6] git commit: CAMEL-6764: camel-jms - Add workaround for AMQ to
get JMSXUserID
Posted by da...@apache.org.
CAMEL-6764: camel-jms - Add workaround for AMQ to get JMSXUserID
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f1004156
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f1004156
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f1004156
Branch: refs/heads/master
Commit: f100415661be5b90e67de18076fcb1678ed9fa4b
Parents: cc99d3e
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Sep 18 11:19:16 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Sep 18 11:19:16 2013 +0200
----------------------------------------------------------------------
.../apache/camel/component/jms/JmsBinding.java | 3 ++-
.../camel/component/jms/JmsMessageHelper.java | 18 +++++++++++++++++-
2 files changed, 19 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/f1004156/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
----------------------------------------------------------------------
diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
index b34479e..9cb393a 100644
--- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
+++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
@@ -170,6 +170,7 @@ public class JmsBinding {
// this works around a bug in the ActiveMQ property handling
map.put("JMSXGroupID", jmsMessage.getStringProperty("JMSXGroupID"));
+ map.put("JMSXUserID", jmsMessage.getStringProperty("JMSXUserID"));
} catch (JMSException e) {
throw new RuntimeCamelException(e);
}
@@ -183,7 +184,7 @@ public class JmsBinding {
while (names.hasMoreElements()) {
String name = names.nextElement().toString();
try {
- Object value = jmsMessage.getObjectProperty(name);
+ Object value = JmsMessageHelper.getProperty(jmsMessage, name);
if (headerFilterStrategy != null
&& headerFilterStrategy.applyFilterToExternalHeaders(name, value, exchange)) {
continue;
http://git-wip-us.apache.org/repos/asf/camel/blob/f1004156/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessageHelper.java
----------------------------------------------------------------------
diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessageHelper.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessageHelper.java
index 89c60dc..8b8f15b 100644
--- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessageHelper.java
+++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessageHelper.java
@@ -70,7 +70,7 @@ public final class JmsMessageHelper {
if (name.equals(key)) {
answer = key;
} else {
- map.put(key, jmsMessage.getObjectProperty(key));
+ map.put(key, getProperty(jmsMessage, key));
}
}
@@ -103,6 +103,22 @@ public final class JmsMessageHelper {
}
/**
+ * Gets a JMS property
+ *
+ * @param jmsMessage the JMS message
+ * @param name name of the property to get
+ * @return the property value, or <tt>null</tt> if does not exists
+ * @throws JMSException can be thrown
+ */
+ public static Object getProperty(Message jmsMessage, String name) throws JMSException {
+ Object value = jmsMessage.getObjectProperty(name);
+ if (value == null) {
+ value = jmsMessage.getStringProperty(name);
+ }
+ return value;
+ }
+
+ /**
* Sets the property on the given JMS message.
*
* @param jmsMessage the JMS message