From 031bf52228cf740cd311dc356a262853a70bea92 Mon Sep 17 00:00:00 2001
From: Tglman <tglman@tglman.com>
Date: Fri, 19 Jan 2024 16:16:00 +0100
Subject: [PATCH] Revert "fix: avoid double stop execution of server"

This reverts commit e89023de099ef3da0b2617ec9dd451cde8549540.
---
 .../server/hazelcast/OHazelcastClusterMetadataManager.java     | 3 +--
 .../main/java/com/orientechnologies/orient/server/OServer.java | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/distributed/src/main/java/com/orientechnologies/orient/server/hazelcast/OHazelcastClusterMetadataManager.java b/distributed/src/main/java/com/orientechnologies/orient/server/hazelcast/OHazelcastClusterMetadataManager.java
index b9474fd23cb..fe8ba7d4dad 100644
--- a/distributed/src/main/java/com/orientechnologies/orient/server/hazelcast/OHazelcastClusterMetadataManager.java
+++ b/distributed/src/main/java/com/orientechnologies/orient/server/hazelcast/OHazelcastClusterMetadataManager.java
@@ -519,7 +519,7 @@ public void hazelcastPluginShutdown() {
       }
     }
 
-    if (hazelcastInstance != null) {
+    if (hazelcastInstance != null)
       try {
         hazelcastInstance.shutdown();
       } catch (Exception e) {
@@ -527,7 +527,6 @@ public void hazelcastPluginShutdown() {
       } 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
index 0119748b091..4fb18e47aea 100755
--- a/server/src/main/java/com/orientechnologies/orient/server/OServer.java
+++ b/server/src/main/java/com/orientechnologies/orient/server/OServer.java
@@ -562,7 +562,6 @@ public boolean shutdown() {
 
   protected boolean deinit() {
     try {
-      if (!running) return false;
       running = false;
 
       OLogManager.instance().info(this, "OrientDB Server is shutting down...");