You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by cs...@apache.org on 2018/09/28 15:46:43 UTC
[aries-rsa] branch master updated (39dde12 -> 8190c9b)
This is an automated email from the ASF dual-hosted git repository.
cschneider pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/aries-rsa.git.
from 39dde12 ARIES-1837 - Avoid ConcurrentModificationException by using ConcurrentHashmap and remove ineffective synchronized
new c1671ba Fix import
new 3bf560c ARIES-1838 - Correctly register watcher for znode data changes
new 8190c9b ARIES-1839 - Fix createBasePath to not create invalid base path
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../discovery/zookeeper/repository/ZookeeperEndpointRepository.java | 4 ++--
.../aries/rsa/discovery/zookeeper/subscribe/InterestManager.java | 1 -
2 files changed, 2 insertions(+), 3 deletions(-)
[aries-rsa] 03/03: ARIES-1839 - Fix createBasePath to not create
invalid base path
Posted by cs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cschneider pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-rsa.git
commit 8190c9bbb8f28fb816667d6ba6c140bd6d9ea56c
Author: Christian Schneider <cs...@adobe.com>
AuthorDate: Fri Sep 28 17:46:26 2018 +0200
ARIES-1839 - Fix createBasePath to not create invalid base path
---
.../rsa/discovery/zookeeper/repository/ZookeeperEndpointRepository.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/repository/ZookeeperEndpointRepository.java b/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/repository/ZookeeperEndpointRepository.java
index 9eec4a7..4f298ef 100644
--- a/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/repository/ZookeeperEndpointRepository.java
+++ b/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/repository/ZookeeperEndpointRepository.java
@@ -152,7 +152,7 @@ public class ZookeeperEndpointRepository implements Closeable, Watcher {
}
private void createBasePath() throws KeeperException, InterruptedException {
- String path = ZookeeperEndpointRepository.getZooKeeperPath(PATH_PREFIX);
+ String path = ZookeeperEndpointRepository.getZooKeeperPath("");
createPath(path);
}
[aries-rsa] 02/03: ARIES-1838 - Correctly register watcher for
znode data changes
Posted by cs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cschneider pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-rsa.git
commit 3bf560cff2a7f30863ab507cc953f4b9f47d1bc7
Author: Christian Schneider <cs...@adobe.com>
AuthorDate: Fri Sep 28 17:44:08 2018 +0200
ARIES-1838 - Correctly register watcher for znode data changes
---
.../rsa/discovery/zookeeper/repository/ZookeeperEndpointRepository.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/repository/ZookeeperEndpointRepository.java b/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/repository/ZookeeperEndpointRepository.java
index 89003a6..9eec4a7 100644
--- a/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/repository/ZookeeperEndpointRepository.java
+++ b/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/repository/ZookeeperEndpointRepository.java
@@ -234,7 +234,7 @@ public class ZookeeperEndpointRepository implements Closeable, Watcher {
private void handleZNodeChanged(String path) throws KeeperException, InterruptedException {
Stat stat = new Stat();
- byte[] data = zk.getData(path, false, stat);
+ byte[] data = zk.getData(path, this, stat);
if (data == null || data.length == 0) {
return;
}
[aries-rsa] 01/03: Fix import
Posted by cs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cschneider pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-rsa.git
commit c1671baa4e2bb9a8ae1a644ab85f61d37ce8985d
Author: Christian Schneider <cs...@adobe.com>
AuthorDate: Fri Sep 28 17:40:31 2018 +0200
Fix import
---
.../apache/aries/rsa/discovery/zookeeper/subscribe/InterestManager.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/subscribe/InterestManager.java b/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/subscribe/InterestManager.java
index 0a74d61..de177f7 100644
--- a/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/subscribe/InterestManager.java
+++ b/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/subscribe/InterestManager.java
@@ -18,7 +18,6 @@
*/
package org.apache.aries.rsa.discovery.zookeeper.subscribe;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;