You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2016/08/22 11:46:42 UTC
[1/2] camel git commit: CAMEL-10261: Mark camel-cache as deprecated
Repository: camel
Updated Branches:
refs/heads/master c34c3bf9c -> c0f8cc33d
CAMEL-10261: Mark camel-cache as deprecated
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c0f8cc33
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c0f8cc33
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c0f8cc33
Branch: refs/heads/master
Commit: c0f8cc33db9c45cf6926a4fef2bfa2921e69e85f
Parents: b7b3422
Author: lburgazzoli <lb...@gmail.com>
Authored: Mon Aug 22 13:44:47 2016 +0200
Committer: lburgazzoli <lb...@gmail.com>
Committed: Mon Aug 22 13:45:21 2016 +0200
----------------------------------------------------------------------
components/camel-cache/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c0f8cc33/components/camel-cache/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-cache/pom.xml b/components/camel-cache/pom.xml
index 99ae3e2..e5e7316 100755
--- a/components/camel-cache/pom.xml
+++ b/components/camel-cache/pom.xml
@@ -27,7 +27,7 @@
<artifactId>camel-cache</artifactId>
<packaging>jar</packaging>
- <name>Camel :: Cache</name>
+ <name>Camel :: Cache (deprecated)</name>
<description>Camel Cache support based on ehCache</description>
<properties>
[2/2] camel git commit: CAMEL-10257: camel-cache - Test failures
Posted by lb...@apache.org.
CAMEL-10257: camel-cache - Test failures
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b7b34227
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b7b34227
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b7b34227
Branch: refs/heads/master
Commit: b7b3422748dc45ea9d9b2fad3c7239ecdb15c676
Parents: c34c3bf
Author: lburgazzoli <lb...@gmail.com>
Authored: Mon Aug 22 13:42:10 2016 +0200
Committer: lburgazzoli <lb...@gmail.com>
Committed: Mon Aug 22 13:45:21 2016 +0200
----------------------------------------------------------------------
.../java/org/apache/camel/component/cache/CacheComponent.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/b7b34227/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheComponent.java b/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheComponent.java
index d9086d8..06d5808 100755
--- a/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheComponent.java
+++ b/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheComponent.java
@@ -50,7 +50,6 @@ public class CacheComponent extends UriEndpointComponent {
ObjectHelper.notNull(configuration, "configuration");
CacheConfiguration config = configuration.copy();
- setProperties(this, parameters);
setProperties(config, parameters);
config.setCacheName(remaining);
@@ -82,7 +81,7 @@ public class CacheComponent extends UriEndpointComponent {
* @param configuration the configuration to use by default for endpoints
*/
public void setConfiguration(CacheConfiguration configuration) {
- this.configuration = configuration;
+ this.configuration = configuration.copy();
}
public String getConfigurationFile() {