From db505c59f65ba88861e05dd37fff8125987e3298 Mon Sep 17 00:00:00 2001 From: Bernard Normier Date: Fri, 11 Oct 2024 17:05:13 -0400 Subject: [PATCH] Small fix to C# logger (#2889) --- csharp/src/Ice/Internal/Instance.cs | 14 ++++---------- csharp/src/Ice/Internal/LoggerAdminLoggerI.cs | 7 +++---- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/csharp/src/Ice/Internal/Instance.cs b/csharp/src/Ice/Internal/Instance.cs index 2b5f1b3a02b..60e95dbab3c 100644 --- a/csharp/src/Ice/Internal/Instance.cs +++ b/csharp/src/Ice/Internal/Instance.cs @@ -1127,12 +1127,9 @@ public void destroy() _initData.observer.setObserverUpdater(null); } + if (_initData.logger is LoggerAdminLogger loggerAdminLogger) { - LoggerAdminLogger logger = _initData.logger as LoggerAdminLogger; - if (logger != null) - { - logger.destroy(); - } + loggerAdminLogger.destroy(); } // @@ -1230,12 +1227,9 @@ public void destroy() Monitor.PulseAll(_mutex); } + if (_initData.logger is FileLoggerI fileLogger) { - Ice.FileLoggerI logger = _initData.logger as Ice.FileLoggerI; - if (logger != null) - { - logger.destroy(); - } + fileLogger.destroy(); } } diff --git a/csharp/src/Ice/Internal/LoggerAdminLoggerI.cs b/csharp/src/Ice/Internal/LoggerAdminLoggerI.cs index edbc6c41ddf..d9d85f278ce 100644 --- a/csharp/src/Ice/Internal/LoggerAdminLoggerI.cs +++ b/csharp/src/Ice/Internal/LoggerAdminLoggerI.cs @@ -4,7 +4,7 @@ namespace Ice.Internal; -internal interface LoggerAdminLogger : Ice.Logger +internal interface LoggerAdminLogger : Logger { Ice.Object getFacet(); @@ -69,10 +69,9 @@ public void destroy() Monitor.PulseAll(_mutex); } - Ice.FileLoggerI fileLoger = _localLogger as Ice.FileLoggerI; - if (fileLoger != null) + if (_localLogger is FileLoggerI fileLogger) { - fileLoger.destroy(); + fileLogger.destroy(); } }