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 2014/10/30 03:36:13 UTC
[1/3] git commit: Fixed a CS error of camel-netty
Repository: camel
Updated Branches:
refs/heads/camel-2.13.x 8578b3fdf -> 4ef48c9d8
refs/heads/camel-2.14.x b561febac -> 02a6a7edb
Fixed a CS error of camel-netty
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7abd1c27
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7abd1c27
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7abd1c27
Branch: refs/heads/camel-2.14.x
Commit: 7abd1c272852aeddf8caa4c90bb829be8fccf26d
Parents: b561feb
Author: Willem Jiang <wi...@gmail.com>
Authored: Thu Oct 30 09:52:19 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Thu Oct 30 10:35:14 2014 +0800
----------------------------------------------------------------------
.../apache/camel/component/netty/DefaultClientPipelineFactory.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/7abd1c27/components/camel-netty/src/main/java/org/apache/camel/component/netty/DefaultClientPipelineFactory.java
----------------------------------------------------------------------
diff --git a/components/camel-netty/src/main/java/org/apache/camel/component/netty/DefaultClientPipelineFactory.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty/DefaultClientPipelineFactory.java
index fe6dd9b..b997720 100644
--- a/components/camel-netty/src/main/java/org/apache/camel/component/netty/DefaultClientPipelineFactory.java
+++ b/components/camel-netty/src/main/java/org/apache/camel/component/netty/DefaultClientPipelineFactory.java
@@ -1,5 +1,5 @@
/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
+ * 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
[2/3] git commit: CAMEL-7975 Reversed the header encoding in
camel-sjms with thanks to Aaron
Posted by ni...@apache.org.
CAMEL-7975 Reversed the header encoding in camel-sjms with thanks to Aaron
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/02a6a7ed
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/02a6a7ed
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/02a6a7ed
Branch: refs/heads/camel-2.14.x
Commit: 02a6a7edbd2b743bd77494c727810cd88d0a4ec2
Parents: 7abd1c2
Author: Willem Jiang <wi...@gmail.com>
Authored: Thu Oct 30 10:33:17 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Thu Oct 30 10:35:29 2014 +0800
----------------------------------------------------------------------
.../apache/camel/component/sjms/SjmsExchangeMessageHelper.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/02a6a7ed/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsExchangeMessageHelper.java
----------------------------------------------------------------------
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsExchangeMessageHelper.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsExchangeMessageHelper.java
index 7d2c8c4..7b7c66b 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsExchangeMessageHelper.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsExchangeMessageHelper.java
@@ -454,7 +454,8 @@ public final class SjmsExchangeMessageHelper {
throw new IllegalHeaderException("Header " + key + " is not a legal JMS header name value");
}
Object value = jmsMessage.getObjectProperty(key);
- headers.put(key, value);
+ String decodedName = new DefaultJmsKeyFormatStrategy().decodeKey(key);
+ headers.put(decodedName, value);
}
}
if (out) {
[3/3] git commit: CAMEL-7975 Reversed the header encoding in
camel-sjms with thanks to Aaron
Posted by ni...@apache.org.
CAMEL-7975 Reversed the header encoding in camel-sjms with thanks to Aaron
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4ef48c9d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4ef48c9d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4ef48c9d
Branch: refs/heads/camel-2.13.x
Commit: 4ef48c9d8dfef8eb6343b89a8613912ae91f6590
Parents: 8578b3f
Author: Willem Jiang <wi...@gmail.com>
Authored: Thu Oct 30 10:33:17 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Thu Oct 30 10:35:48 2014 +0800
----------------------------------------------------------------------
.../apache/camel/component/sjms/SjmsExchangeMessageHelper.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/4ef48c9d/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsExchangeMessageHelper.java
----------------------------------------------------------------------
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsExchangeMessageHelper.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsExchangeMessageHelper.java
index d492183..8b4bdf9 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsExchangeMessageHelper.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsExchangeMessageHelper.java
@@ -455,7 +455,8 @@ public final class SjmsExchangeMessageHelper {
throw new IllegalHeaderException("Header " + key + " is not a legal JMS header name value");
}
Object value = jmsMessage.getObjectProperty(key);
- headers.put(key, value);
+ String decodedName = new DefaultJmsKeyFormatStrategy().decodeKey(key);
+ headers.put(decodedName, value);
}
}
if (out) {