leverage exception when

src/contrib/testkits/Akka.TestKit.Xunit/Internals/Loggers.cs

@@ -46,17 +46,13 @@ private void HandleLogEvent(LogEvent e)
             _output.WriteLine(e.ToString());
         }
         catch (FormatException ex)
+            when (e.Message is LogMessage msg)
         {
-            if (e.Message is LogMessage msg)
-            {
-                var message =
-                    $"Received a malformed formatted message. Log level: [{e.LogLevel()}], Template: [{msg.Format}], args: [{string.Join(",", msg.Unformatted())}]";
-                if (e.Cause != null)
-                    throw new AggregateException(message, ex, e.Cause);
-                throw new FormatException(message, ex);
-            }
-
-            throw;
+            var message =
+                $"Received a malformed formatted message. Log level: [{e.LogLevel()}], Template: [{msg.Format}], args: [{string.Join(",", msg.Unformatted())}]";
+            if (e.Cause != null)
+                throw new AggregateException(message, ex, e.Cause);
+            throw new FormatException(message, ex);
         }
         catch (InvalidOperationException ie)
         {

src/contrib/testkits/Akka.TestKit.Xunit2/Internals/Loggers.cs

@@ -46,17 +46,13 @@ private void HandleLogEvent(LogEvent e)
                 _output.WriteLine(e.ToString());
             }
             catch (FormatException ex)
+                when (e.Message is LogMessage msg)
             {
-                if (e.Message is LogMessage msg)
-                {
-                    var message =
-                        $"Received a malformed formatted message. Log level: [{e.LogLevel()}], Template: [{msg.Format}], args: [{string.Join(",", msg.Unformatted())}]";
-                    if (e.Cause != null)
-                        throw new AggregateException(message, ex, e.Cause);
-                    throw new FormatException(message, ex);
-                }
-
-                throw;
+                var message =
+                    $"Received a malformed formatted message. Log level: [{e.LogLevel()}], Template: [{msg.Format}], args: [{string.Join(",", msg.Unformatted())}]";
+                if (e.Cause != null)
+                    throw new AggregateException(message, ex, e.Cause);
+                throw new FormatException(message, ex);
             }
             catch (InvalidOperationException ie)
             {

src/core/Akka.Discovery/Discovery.cs

@@ -79,17 +79,16 @@ private ServiceDiscovery CreateServiceDiscovery(string method)
                 return Create(className);
             }
             catch (Exception ex)
+                when (ex is TypeLoadException or MissingMethodException)
             {
-                if (ex is TypeLoadException or MissingMethodException)
-                    throw new ArgumentException(
-                        message: $"Illegal akka.discovery.{method}.class value or incompatible class!\n" +
-                                 "The implementation class MUST extend Akka.Discovery.ServiceDiscovery with:\n" +
-                                 "  * parameterless constructor, " +
-                                 $"  * constructor with a single {nameof(ExtendedActorSystem)} parameter, or\n" +
-                                 $"  * constructor with {nameof(ExtendedActorSystem)} and {nameof(Configuration.Config)} parameters.",
-                        paramName: nameof(method), 
-                        innerException: ex);
-                throw;
+                throw new ArgumentException(
+                    message: $"Illegal akka.discovery.{method}.class value or incompatible class!\n" +
+                             "The implementation class MUST extend Akka.Discovery.ServiceDiscovery with:\n" +
+                             "  * parameterless constructor, " +
+                             $"  * constructor with a single {nameof(ExtendedActorSystem)} parameter, or\n" +
+                             $"  * constructor with {nameof(ExtendedActorSystem)} and {nameof(Configuration.Config)} parameters.",
+                    paramName: nameof(method),
+                    innerException: ex);
             }
 
             ServiceDiscovery Create(string typeName)

src/core/Akka.Persistence/Journal/ReplayFilter.cs

@@ -233,18 +233,18 @@ protected override bool Receive(object message)
                                         throw new ArgumentException("Mode must not be Disabled");
                                 }
                             }
+
                             node = next;
                         }
+
                         _buffer.AddLast(value);
                     }
 
                 }
                 catch (IllegalStateException ex)
+                    when (Mode == ReplayFilterMode.Fail)
                 {
-                    if (Mode == ReplayFilterMode.Fail)
-                        Fail(ex);
-                    else
-                        throw;
+                    Fail(ex);
                 }
             }
             else if (message is RecoverySuccess or ReplayMessagesFailure)

src/core/Akka.Remote.Tests/Transport/DotNettyTransportDnsResolutionSpec.cs

@@ -155,13 +155,11 @@ public Property HeliosTransport_Should_Resolve_DNS(EndPoint inbound, EndPoint ou
                           useIpv6Dns: dnsIpv6,
                           enforceIpFamily: enforceIpFamily);
                 }
-                catch
+                catch when (enforceIpFamily && IsExpectedFailure(inbound, outbound, dnsIpv6))
                 {
                     //if ip family is enforced, there are some special cases when it is normal to unable 
                     //to create actor system
-                    if (enforceIpFamily && IsExpectedFailure(inbound, outbound, dnsIpv6))
-                        return true.ToProperty();
-                    throw;
+                    return true.ToProperty();
                 }
 
                 var outboundReceivedAck = true;
@@ -246,14 +244,13 @@ public Property HeliosTransport_Should_Resolve_DNS_with_PublicHostname(IPEndPoin
                           dnsUseIpv6,
                           enforceIpFamily);
                 }
-                catch
+                catch when (enforceIpFamily && IsExpectedFailure(inbound, outbound, dnsUseIpv6))
                 {
                     //if ip family is enforced, there are some special cases when it is normal to unable 
                     //to create actor system
-                    if (enforceIpFamily && IsExpectedFailure(inbound, outbound, dnsUseIpv6))
-                        return true.ToProperty();
-                    throw;
+                    return true.ToProperty();
                 }
+
                 var outboundReceivedAck = true;
                 var inboundReceivedAck = true;
                 _outbound.ActorSelection(_inboundAck).Tell("ping", _outboundProbe.Ref);

src/core/Akka.Remote/Transport/DotNetty/DotNettyTransportSettings.cs

@@ -257,11 +257,10 @@ public static SslSettings CreateOrDefault(Config config, SslSettings? @default =
             {
                 return Create(config);
             }
-            catch(Exception)
+            catch (Exception)
+                when (@default != null)
             {
-                if (@default != null)
-                    return @default;
-                throw;
+                return @default;
             }
         }
 

src/core/Akka.Streams/Implementation/ActorPublisher.cs

@@ -267,9 +267,8 @@ private void ReportSubscribeFailure(ISubscriber<TOut> subscriber)
                 }
             }
             catch (Exception exception)
+                when (exception is ISpecViolation)
             {
-                if (!(exception is ISpecViolation))
-                    throw;
             }
         }
     }

src/core/Akka.Streams/Implementation/CompletedPublishers.cs

@@ -38,9 +38,8 @@ public void Subscribe(ISubscriber<T> subscriber)
                 ReactiveStreamsCompliance.TryOnComplete(subscriber);
             }
             catch (Exception e)
+                when (e is ISpecViolation)
             {
-                if (!(e is ISpecViolation))
-                    throw;
             }
         }
 
@@ -91,9 +90,8 @@ public void Subscribe(ISubscriber<T> subscriber)
                 ReactiveStreamsCompliance.TryOnError(subscriber, Cause);
             }
             catch (Exception e)
+                when (e is ISpecViolation)
             {
-                if (!(e is ISpecViolation))
-                    throw;
             }
         }
 
@@ -270,9 +268,8 @@ public void Subscribe(ISubscriber<T> subscriber)
                 ReactiveStreamsCompliance.RejectAdditionalSubscriber(subscriber, "Publisher");
             }
             catch (Exception e)
+                when (e is ISpecViolation)
             {
-                if (!(e is ISpecViolation))
-                    throw;
             }
         }
 

src/core/Akka.Streams/Implementation/SubscriberManagement.cs

@@ -265,14 +265,10 @@ private long DispatchFromBufferAndReturnRemainingRequested(long requested, ISubs
                         goOn = true;
                     }
                     catch (Exception e)
+                        when (e is ISpecViolation)
                     {
-                        if (e is ISpecViolation)
-                        {
-                            UnregisterSubscriptionInternal(subscription);
-                            goOn = false;
-                        }
-                        else
-                            throw;
+                        UnregisterSubscriptionInternal(subscription);
+                        goOn = false;
                     }
 
                     if (!goOn)

src/core/Akka.TestKit/Internal/InternalTestActor.cs

@@ -45,12 +45,10 @@ protected override void OnReceive(object message)
                 System.Diagnostics.Debug.WriteLine("TestActor received " + message);
             }
             catch (FormatException)
+                when (message is LogEvent { Message: LogMessage msg })
             {
-                if (message is LogEvent { Message: LogMessage msg })
-                    System.Diagnostics.Debug.WriteLine(
-                        $"TestActor received a malformed formatted message. Template:[{msg.Format}], args:[{string.Join(",", msg.Unformatted())}]");
-                else
-                    throw;
+                System.Diagnostics.Debug.WriteLine(
+                    $"TestActor received a malformed formatted message. Template:[{msg.Format}], args:[{string.Join(",", msg.Unformatted())}]");
             }
 
             switch (message)

src/core/Akka/Dispatch/Mailboxes.cs

@@ -315,10 +315,9 @@ MailboxType VerifyRequirements(MailboxType mailboxType)
                     return VerifyRequirements(LookupByQueueType(actorRequirement.Value));
                 }
                 catch (Exception)
+                    when (hasMailboxRequirement)
                 {
-                    if (hasMailboxRequirement)
-                        return VerifyRequirements(LookupByQueueType(mailboxRequirement));
-                    throw;
+                    return VerifyRequirements(LookupByQueueType(mailboxRequirement));
                 }
             }
             if (hasMailboxRequirement)