Author: ningjiang
Date: Wed Sep 19 13:41:41 2012
New Revision: 1387593
URL: http://svn.apache.org/viewvc?rev=1387593&view=rev
Log:
CAMEL-5627 the camel-zookeeper component should not share the configuration
object
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperComponent.java
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1387545
Merged /camel/branches/camel-2.10.x:r1387588
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.9.x/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperComponent.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperComponent.java?rev=1387593&r1=1387592&r2=1387593&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperComponent.java
(original)
+++
camel/branches/camel-2.9.x/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperComponent.java
Wed Sep 19 13:41:41 2012
@@ -49,11 +49,11 @@ public class ZooKeeperComponent extends
throw new CamelException("No Camel context has been provided to
this zookeeper component");
}
- ZooKeeperConfiguration config = getConfiguration();
+ ZooKeeperConfiguration config = getConfiguration().copy();
extractConfigFromUri(uri, config);
setProperties(config, parameters);
- return new ZooKeeperEndpoint(uri, this, config.copy());
+ return new ZooKeeperEndpoint(uri, this, config);
}
private void extractConfigFromUri(String remaining, ZooKeeperConfiguration
config) throws URISyntaxException {
