You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2012/11/30 21:36:53 UTC
svn commit: r1415843 - in /camel/branches/camel-2.10.x: ./
components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/
Author: bvahdat
Date: Fri Nov 30 20:36:52 2012
New Revision: 1415843
URL: http://svn.apache.org/viewvc?rev=1415843&view=rev
Log:
Merged revisions 1415838 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1415838 | bvahdat | 2012-11-30 21:26:36 +0100 (Fr, 30 Nov 2012) | 1 line
CAMEL-5838: The 'awaitExistence' property's setter/getter method names should match with the field's name itself. As well did some tiny polishment.
........
Modified:
camel/branches/camel-2.10.x/ (props changed)
camel/branches/camel-2.10.x/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperConfiguration.java
camel/branches/camel-2.10.x/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperEndpoint.java
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1415838
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.10.x/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperConfiguration.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperConfiguration.java?rev=1415843&r1=1415842&r2=1415843&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperConfiguration.java (original)
+++ camel/branches/camel-2.10.x/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperConfiguration.java Fri Nov 30 20:36:52 2012
@@ -37,7 +37,7 @@ public class ZooKeeperConfiguration impl
private int sessionId;
private byte[] password;
private String path;
- private boolean awaitCreation = true;
+ private boolean awaitExistence = true;
private boolean repeat;
private boolean listChildren;
private boolean shouldCreate;
@@ -86,7 +86,6 @@ public class ZooKeeperConfiguration impl
}
public String getConnectString() {
- // return StringHelper.toStringCommaSeparated(servers);
StringBuilder b = new StringBuilder();
for (String server : servers) {
b.append(server).append(",");
@@ -129,11 +128,11 @@ public class ZooKeeperConfiguration impl
}
public boolean shouldAwaitExistence() {
- return awaitCreation;
+ return awaitExistence;
}
- public void setAwaitExistance(boolean awaitCreation) {
- this.awaitCreation = awaitCreation;
+ public void setAwaitExistance(boolean awaitExistence) {
+ this.awaitExistence = awaitExistence;
}
public long getBackoff() {
Modified: camel/branches/camel-2.10.x/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperEndpoint.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperEndpoint.java?rev=1415843&r1=1415842&r2=1415843&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperEndpoint.java (original)
+++ camel/branches/camel-2.10.x/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperEndpoint.java Fri Nov 30 20:36:52 2012
@@ -114,11 +114,6 @@ public class ZooKeeperEndpoint extends D
getConfiguration().setServers(servers);
}
- // TODO: check how to allow should to indicate getter of an attribute pair
-// public boolean shouldListChildren() {
-// return getConfiguration().listChildren();
-// }
-
@ManagedAttribute
public boolean getListChildren() {
return getConfiguration().listChildren();
@@ -129,10 +124,6 @@ public class ZooKeeperEndpoint extends D
getConfiguration().setListChildren(listChildren);
}
-// public boolean shouldCreate() {
-// return getConfiguration().shouldCreate();
-// }
-
@ManagedAttribute
public boolean getCreate() {
return getConfiguration().shouldCreate();
@@ -153,10 +144,6 @@ public class ZooKeeperEndpoint extends D
getConfiguration().setBackoff(backoff);
}
-// public boolean shouldAwaitExistence() {
-// return getConfiguration().shouldAwaitExistence();
-// }
-
@ManagedAttribute
public boolean getAwaitExistence() {
return getConfiguration().shouldAwaitExistence();