fix: avoid double stop execution of server

orientechnologies · Jan 19, 2024 · e89023d · e89023d
1 parent ad20dfa
commit e89023d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/.../java/com/orientechnologies/orient/server/hazelcast/OHazelcastClusterMetadataManager.java b/.../java/com/orientechnologies/orient/server/hazelcast/OHazelcastClusterMetadataManager.java
@@ -519,14 +519,15 @@ public void hazelcastPluginShutdown() {
       }
     }
 
-    if (hazelcastInstance != null)
+    if (hazelcastInstance != null) {
       try {
         hazelcastInstance.shutdown();
       } catch (Exception e) {
         OLogManager.instance().error(this, "Error on shutting down Hazelcast instance", e);
       } finally {
         hazelcastInstance = null;
       }
+    }
 
     OCallableUtils.executeIgnoringAnyExceptions(
         new OCallableNoParamNoReturn() {

diff --git a/server/src/main/java/com/orientechnologies/orient/server/OServer.java b/server/src/main/java/com/orientechnologies/orient/server/OServer.java
@@ -562,6 +562,7 @@ public boolean shutdown() {
 
   protected boolean deinit() {
     try {
+      if (!running) return false;
       running = false;
 
       OLogManager.instance().info(this, "OrientDB Server is shutting down...");