diff --git a/curator-framework/src/test/java/org/apache/curator/framework/imps/TestFramework.java b/curator-framework/src/test/java/org/apache/curator/framework/imps/TestFramework.java
index 6ffd03406..07ecf3338 100644
--- a/curator-framework/src/test/java/org/apache/curator/framework/imps/TestFramework.java
+++ b/curator-framework/src/test/java/org/apache/curator/framework/imps/TestFramework.java
@@ -479,7 +479,7 @@ public void stateChanged(CuratorFramework client, ConnectionState newState) {
try {
client.checkExists().forPath("/");
fail("Connection should be down");
- } catch (KeeperException.ConnectionLossException e) {
+ } catch (KeeperException.ConnectionLossException | KeeperException.SessionExpiredException e) {
// expected
}
diff --git a/curator-test/src/main/java/org/apache/curator/test/TestingZooKeeperMain.java b/curator-test/src/main/java/org/apache/curator/test/TestingZooKeeperMain.java
index 74d39daf2..79f63fffb 100644
--- a/curator-test/src/main/java/org/apache/curator/test/TestingZooKeeperMain.java
+++ b/curator-test/src/main/java/org/apache/curator/test/TestingZooKeeperMain.java
@@ -165,7 +165,7 @@ public void close() throws IOException {
try {
if (zkServer != null) {
- zkServer.shutdown();
+ zkServer.customShutdown();
ZKDatabase zkDb = zkServer.getZKDatabase();
if (zkDb != null) {
// make ZK server close its log files
@@ -209,7 +209,7 @@ private void internalRunFromConfig(ServerConfig config) throws IOException {
latch.countDown();
cnxnFactory.join();
if ((zkServer != null) && zkServer.isRunning()) {
- zkServer.shutdown();
+ zkServer.customShutdown();
}
} catch (InterruptedException e) {
// warn, but generally this is ok
@@ -255,9 +255,8 @@ public TestZooKeeperServer(FileTxnSnapLog txnLog, ServerConfig config) {
this.setMaxSessionTimeout(config.getMaxSessionTimeout());
}
- @Override
- public synchronized void shutdown(boolean fullyShutDown) {
- super.shutdown(fullyShutDown);
+ public synchronized void customShutdown() {
+ super.shutdown();
try {
txnLog.close();
} catch (IOException e) {
diff --git a/pom.xml b/pom.xml
index d83d2f1ce..55f4f37d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,7 +72,7 @@
true
- 3.9.2
+ 3.9.3
5.1.4
3.10.0
3.2.0