home/pinpoint
2
0
Fork 0
mirror of https://github.com/wahyd4/pinpoint.git synced 2026-08-25 12:46:21 +10:00
Code Issues Packages Projects Releases Wiki Activity

fixed possibility of npe in ZookeeperClusterDataManager. #1472

Browse Source
This commit is contained in:
koo.taejin
2016-01-21 15:59:04 +09:00
parent 7ab21927f7
commit 3e445a35c2
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
collector/src/main/java/com/navercorp/pinpoint/collector/cluster/zookeeper/DefaultZookeeperClient.java
+3 -4
View File
@@ -23,7 +23,6 @@ import com.navercorp.pinpoint.collector.cluster.zookeeper.exception.NoNodeExcept
import com.navercorp.pinpoint.collector.cluster.zookeeper.exception.PinpointZookeeperException;
import com.navercorp.pinpoint.collector.cluster.zookeeper.exception.TimeoutException;
import com.navercorp.pinpoint.collector.cluster.zookeeper.exception.UnknownException;
import com.navercorp.pinpoint.common.util.concurrent.CommonState;
import com.navercorp.pinpoint.common.util.concurrent.CommonStateContext;
import com.navercorp.pinpoint.rpc.util.TimerFactory;
import org.apache.zookeeper.CreateMode;
@@ -92,7 +91,7 @@ public class DefaultZookeeperClient implements ZookeeperClient {
@Override
public void reconnectWhenSessionExpired() {
if (stateContext.getCurrentState() != CommonState.STARTED) {
if (!stateContext.isStarted()) {
logger.warn("ZookeeperClient.reconnectWhenSessionExpired() failed. Error: Already closed.");
return;
}
@@ -111,7 +110,7 @@ public class DefaultZookeeperClient implements ZookeeperClient {
}
ZooKeeper newZookeeper = createNewZookeeper();
if (stateContext.getCurrentState() != CommonState.STARTED) {
if (!stateContext.isStarted()) {
logger.warn("ZookeeperClient.reconnectWhenSessionExpired() failed. Error: Already closed.");
return;
}
@@ -277,7 +276,7 @@ public class DefaultZookeeperClient implements ZookeeperClient {
@Override
public boolean isConnected() {
if (!watcher.isConnected() || stateContext.getCurrentState() != CommonState.STARTED) {
if (!watcher.isConnected() || !stateContext.isStarted()) {
return false;
}
web/src/main/java/com/navercorp/pinpoint/web/cluster/zookeeper/ZookeeperClient.java
+2 -3
View File
@@ -17,7 +17,6 @@
package com.navercorp.pinpoint.web.cluster.zookeeper;
import com.navercorp.pinpoint.common.util.concurrent.CommonState;
import com.navercorp.pinpoint.common.util.concurrent.CommonStateContext;
import com.navercorp.pinpoint.rpc.util.TimerFactory;
import com.navercorp.pinpoint.web.cluster.zookeeper.exception.AuthException;
@@ -94,7 +93,7 @@ public class ZookeeperClient {
}
public void reconnectWhenSessionExpired() {
if (stateContext.getCurrentState() != CommonState.STARTED) {
if (!stateContext.isStarted()) {
logger.warn("ZookeeperClient.reconnectWhenSessionExpired() failed. Error: Already closed.");
return;
}
@@ -259,7 +258,7 @@ public class ZookeeperClient {
}
private void checkState() throws PinpointZookeeperException {
if (!zookeeperDataManager.isConnected() || stateContext.getCurrentState() != CommonState.STARTED) {
if (!zookeeperDataManager.isConnected() || !stateContext.isStarted()) {
throw new ConnectionException("Instance must be connected.");
}
}