Refactor ZookeeperRepository.query() (#31354)

apache · May 22, 2024 · 5ec1253 · 5ec1253
1 parent 62fc079
commit 5ec1253
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/...java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/ZookeeperRepository.java b/...java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/ZookeeperRepository.java
@@ -34,13 +34,15 @@
 import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
 import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
 import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepositoryConfiguration;
+import org.apache.shardingsphere.mode.repository.cluster.exception.ClusterPersistRepositoryException;
 import org.apache.shardingsphere.mode.repository.cluster.listener.DataChangedEventListener;
 import org.apache.shardingsphere.mode.repository.cluster.lock.holder.DistributedLockHolder;
 import org.apache.shardingsphere.mode.repository.cluster.zookeeper.handler.ZookeeperExceptionHandler;
 import org.apache.shardingsphere.mode.repository.cluster.zookeeper.listener.SessionConnectionReconnectListener;
 import org.apache.shardingsphere.mode.repository.cluster.zookeeper.props.ZookeeperProperties;
 import org.apache.shardingsphere.mode.repository.cluster.zookeeper.props.ZookeeperPropertyKey;
 import org.apache.zookeeper.CreateMode;
+import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.KeeperException.NodeExistsException;
 import org.apache.zookeeper.KeeperException.OperationTimeoutException;
 import org.apache.zookeeper.ZooDefs;
@@ -170,11 +172,12 @@ public void update(final String key, final String value) {
     public String query(final String key) {
         try {
             return new String(client.getData().forPath(key), StandardCharsets.UTF_8);
+        } catch (final KeeperException.NoNodeException ex) {
+            return null;
             // CHECKSTYLE:OFF
         } catch (final Exception ex) {
             // CHECKSTYLE:ON
-            ZookeeperExceptionHandler.handleException(ex);
-            return null;
+            throw new ClusterPersistRepositoryException(ex);
         }
     }