Skip to content

fix Issue 3866 #4126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chickenlj merged 11 commits into from
May 23, 2019
Merged

fix Issue 3866 #4126

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a0a8422
fix #2842. remove duplicate SPI definitions for 2.7.x
cvictory Jan 25, 2019
98b2f4b
Merge branch 'master' of github.com:apache/incubator-dubbo
cvictory Feb 21, 2019
19824c3
fix: rename the thread name from DubboRegistryFailedRetryTimer to Dub…
cvictory Feb 21, 2019
05b158d
Merge branch 'master' of github.com:apache/incubator-dubbo
cvictory Apr 8, 2019
6b6023f
Merge branch 'master' of github.com:apache/incubator-dubbo
cvictory Apr 10, 2019
fbc167d
Merge branch 'master' of github.com:apache/incubator-dubbo
cvictory Apr 16, 2019
9a96ac2
Merge branch 'master' of github.com:apache/incubator-dubbo
cvictory Apr 18, 2019
a5366b4
Merge branch 'master' of github.com:apache/incubator-dubbo
cvictory Apr 29, 2019
e4bbfc4
Merge branch 'master' of github.com:apache/incubator-dubbo
cvictory Apr 30, 2019
2cbbd45
Merge branch 'master' of github.com:apache/incubator-dubbo
cvictory May 23, 2019
4eca5fd
fix #3866
cvictory May 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions ...per/src/main/java/org/apache/dubbo/remoting/zookeeper/curator/CuratorZookeeperClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
package org.apache.dubbo.remoting.zookeeper.curator;

import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.logger.Logger;
import org.apache.dubbo.common.logger.LoggerFactory;
import org.apache.dubbo.common.utils.StringUtils;
import org.apache.dubbo.remoting.zookeeper.ChildListener;
import org.apache.dubbo.remoting.zookeeper.DataListener;
Expand Down Expand Up @@ -49,6 +51,8 @@

public class CuratorZookeeperClient extends AbstractZookeeperClient<CuratorZookeeperClient.CuratorWatcherImpl, CuratorZookeeperClient.CuratorWatcherImpl> {

protected static final Logger logger = LoggerFactory.getLogger(CuratorZookeeperClient.class);

static final Charset CHARSET = Charset.forName("UTF-8");
private final CuratorFramework client;
private Map<String, TreeCache> treeCacheMap = new ConcurrentHashMap<>();
Expand Down Expand Up @@ -288,6 +292,9 @@ public void process(WatchedEvent event) throws Exception {
@Override
public void childEvent(CuratorFramework client, TreeCacheEvent event) throws Exception {
if (dataListener != null) {
if (logger.isInfoEnabled()) {
logger.info("listen the zookeeper changed. The changed data:" + event.getData());
}
TreeCacheEvent.Type type = event.getType();
EventType eventType = null;
String content = null;
Expand All @@ -296,12 +303,12 @@ public void childEvent(CuratorFramework client, TreeCacheEvent event) throws Exc
case NODE_ADDED:
eventType = EventType.NodeCreated;
path = event.getData().getPath();
content = new String(event.getData().getData(), CHARSET);
content = event.getData().getData() == null ? "" : new String(event.getData().getData(), CHARSET);
break;
case NODE_UPDATED:
eventType = EventType.NodeDataChanged;
path = event.getData().getPath();
content = new String(event.getData().getData(), CHARSET);
content = event.getData().getData() == null ? "" : new String(event.getData().getData(), CHARSET);
break;
case NODE_REMOVED:
path = event.getData().getPath();
Expand Down
⚡