1 files changed, 6 insertions, 12 deletions
diff --git a/ACE/ace/Svc_Handler.cpp b/ACE/ace/Svc_Handler.cpp
index af57b7fb16d..7941c34238c 100644
--- a/ACE/ace/Svc_Handler.cpp
+++ b/ACE/ace/Svc_Handler.cpp
@@ -111,13 +111,11 @@ ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::destroy (void)
   // Only delete ourselves if we're not owned by a module and have
   // been allocated dynamically.
   if (this->mod_ == 0 && this->dynamic_ && this->closing_ == false)
-    {
-      // Will call the destructor, which automatically calls <shutdown>.
-      // Note that if we are *not* allocated dynamically then the
-      // destructor will call <shutdown> automatically when it gets run
-      // during cleanup.
-      delete this;
-    }
+    // Will call the destructor, which automatically calls <shutdown>.
+    // Note that if we are *not* allocated dynamically then the
+    // destructor will call <shutdown> automatically when it gets run
+    // during cleanup.
+    delete this;
 }
 
 template <PR_ST_1, ACE_SYNCH_DECL> void
@@ -304,11 +302,7 @@ ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::handle_close (ACE_HANDLE,
 {
   ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::handle_close");
 
-  if (this->reference_counting_policy ().value () ==
-      ACE_Event_Handler::Reference_Counting_Policy::DISABLED)
-    {
-      this->destroy ();
-    }
+  this->destroy ();
 
   return 0;
 }