Merge remote-tracking branch 'origin/master' into NET6.0

LiveOrDevTrying · Jul 10, 2023 · cceda10 · cceda10
2 parents e998b55 + 6da5517
commit cceda10
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/Tcp.NET.Client/Handlers/TcpClientHandlerBase.cs b/Tcp.NET.Client/Handlers/TcpClientHandlerBase.cs
@@ -47,7 +47,7 @@ public override async Task<bool> ConnectAsync(CancellationToken cancellationToke
                     }
                     else
                     {
-                        await CreateNonSSLConnectionAsync(cancellationToken).ConfigureAwait(false);
+                        await CreateConnectionAsync(cancellationToken).ConfigureAwait(false);
                     }
 
                     if (_connection != null && _connection.TcpClient.Connected && !cancellationToken.IsCancellationRequested)
@@ -162,9 +162,9 @@ public override async Task<bool> SendAsync(string message, CancellationToken can
                         Bytes = bytes,
                         CancellationToken = cancellationToken
                     }));
-
-                    return true;
                 }
+
+                return true;
             }
             catch (Exception ex)
             {
@@ -212,9 +212,9 @@ public override async Task<bool> SendAsync(byte[] message, CancellationToken can
                         Bytes = bytes,
                         CancellationToken = cancellationToken
                     }));
-
-                    return true;
                 }
+
+                return true;
             }
             catch (Exception ex)
             {
@@ -349,7 +349,7 @@ protected virtual async Task ReceiveAsync(CancellationToken cancellationToken)
             await DisconnectAsync(cancellationToken).ConfigureAwait(false);
         }
 
-        protected virtual async Task CreateNonSSLConnectionAsync(CancellationToken cancellationToken)
+        protected virtual async Task CreateConnectionAsync(CancellationToken cancellationToken)
         {
             // Establish the remote endpoint for the socket.  
             _connection?.Dispose();

diff --git a/Tcp.NET.Server/Handlers/TcpHandlerServerBase.cs b/Tcp.NET.Server/Handlers/TcpHandlerServerBase.cs
@@ -372,9 +372,9 @@ public override async Task<bool> SendAsync(string message, Z connection, Cancell
                         Bytes = bytes,
                         CancellationToken = cancellationToken
                     }));
-
-                    return true;
                 }
+
+                return true;
             }
             catch (Exception ex)
             {
@@ -421,9 +421,9 @@ public override async Task<bool> SendAsync(byte[] message, Z connection, Cancell
                         Bytes = bytes,
                         CancellationToken = cancellationToken
                     }));
-
-                    return true;
                 }
+
+                return true;
             }
             catch (Exception ex)
             {

diff --git a/TestApps/Tcp.NET.TestApps.Client/Program.cs b/TestApps/Tcp.NET.TestApps.Client/Program.cs
@@ -114,7 +114,7 @@ private static void OnMessageEvent(object sender, TcpMessageClientEventArgs args
                 case MessageEventType.Sent:
                     break;
                 case MessageEventType.Receive:
-                    //Console.WriteLine(args.Message + " : " + +_clients.Values.Where(x => x.IsRunning).Count());
+                    Console.WriteLine(args.Message + " : " + +_clients.Values.Where(x => x.IsRunning).Count());
                     break;
                 default:
                     break;