From f2bc957229e5fd23001f9ed65c267fe911d360ba Mon Sep 17 00:00:00 2001 From: Joseph Doherty Date: Sat, 28 Feb 2026 20:59:47 -0500 Subject: [PATCH] chore(batch23): start routes batch --- .../ZB.MOM.NatsNet.Server/Accounts/Account.cs | 12 ++++++------ .../ZB.MOM.NatsNet.Server/ClientConnection.cs | 2 +- porting.db | Bin 6721536 -> 6721536 bytes 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dotnet/src/ZB.MOM.NatsNet.Server/Accounts/Account.cs b/dotnet/src/ZB.MOM.NatsNet.Server/Accounts/Account.cs index 9718c11..a9536c4 100644 --- a/dotnet/src/ZB.MOM.NatsNet.Server/Accounts/Account.cs +++ b/dotnet/src/ZB.MOM.NatsNet.Server/Accounts/Account.cs @@ -2279,7 +2279,7 @@ public sealed class Account : INatsAccount } if (sid is { Length: > 0 } && InternalClient != null) - InternalClient.ProcessUnsub(sid); + InternalClient.RemoveSubBySid(sid); if (tracking && requestor != null && !delivered) SendBackendErrorTrackingLatency(serviceImport, reason); @@ -2355,7 +2355,7 @@ public sealed class Account : INatsAccount } if (sid != null && InternalClient != null) - InternalClient.ProcessUnsub(sid); + InternalClient.RemoveSubBySid(sid); } /// @@ -2548,7 +2548,7 @@ public sealed class Account : INatsAccount if (InternalClient == null && Server is NatsServer server) { InternalClient = server.CreateInternalAccountClient(); - InternalClient.Account = this; + InternalClient.SetAccount(this); } return InternalClient; @@ -2573,7 +2573,7 @@ public sealed class Account : INatsAccount _mu.EnterReadLock(); var internalClient = InternalClient; _mu.ExitReadLock(); - internalClient?.ProcessUnsub(sub.Sid); + internalClient?.RemoveSubBySid(sub.Sid); } /// @@ -2685,7 +2685,7 @@ public sealed class Account : INatsAccount return; foreach (var sid in subscriptionIds) - internalClient.ProcessUnsub(sid); + internalClient.RemoveSubBySid(sid); internalClient.CloseConnection(ClosedState.InternalClient); } @@ -4170,7 +4170,7 @@ public sealed class Account : INatsAccount return new ClientInfo { Id = client.Cid, - Account = client.Account?.Name ?? string.Empty, + Account = client.Account()?.Name ?? string.Empty, Name = client.Opts.Name ?? string.Empty, Rtt = client.GetRttValue(), Start = client.Start == default ? string.Empty : client.Start.ToUniversalTime().ToString("O"), diff --git a/dotnet/src/ZB.MOM.NatsNet.Server/ClientConnection.cs b/dotnet/src/ZB.MOM.NatsNet.Server/ClientConnection.cs index 7888792..9066d2e 100644 --- a/dotnet/src/ZB.MOM.NatsNet.Server/ClientConnection.cs +++ b/dotnet/src/ZB.MOM.NatsNet.Server/ClientConnection.cs @@ -1686,7 +1686,7 @@ public sealed partial class ClientConnection } } - internal void ProcessUnsub(byte[] sid) + internal void RemoveSubBySid(byte[] sid) { lock (_mu) { diff --git a/porting.db b/porting.db index 4e827a7626776085291cb8f22349974bbf1d063b..dc90e94bc0fcdf2ea8fb99c53b9c56fbbe3d31cf 100644 GIT binary patch delta 420 zcmWl~Nlz1D0D$57x=c$uGoK((i;6{{NLjQlfKbE*aIHH#ABflxFJM}T2QQGk(VsA) zm-z#5GMN}I#F%iJ#2aTh&>JyPJa}?AJb6}~Pr=nA2m%BN5k@CMlnP?RF)*=^9HWvd zj#EtywInz}k~&Uuiqq6{h7=8)rI99@Nz=kPTFKBxI~{a#o(p8T$R#dwg)X}3;VQlK zk)xk$3~-$r+~gL63^B}Y?r@iT+~)y#9`cCCJmD$Nc+Lo;j4{pxlT0!FMd^-k?TDk& z(lvMFq0GoCsayZ712^ZWcc#6wp`=J0wH2`TY&O+QNY-nHyT7SYmBS@1)>N?;{T&^Q z97OW^u09t270!pghWdg(g7bktfjRM4eiV+(SzFeSS=LJCdoyEr#)6^8*F{?M;#O?k zZb*ri*mxqYB?p8MjrM0xHP^geoPASVS|}DurEFJwwx_tXvRtr#epj{b+ig{6ekgm& XH{+Z2z3|QXUi#*JuiUa%NPhbd;TD<4 delta 411 zcmWl|KTi{30KnnCy>dtIdiS+%FgX*J#)YZIf$#xLup1j8aq@VQXT{slR*oYGqYIYkY%oF+vbY0hw#dd`udfkv7*PctoC;3Ai3rHytjbA_v9xkd+_ba9;Y2DG!Be){YYQcMb$>+C^Dn%YfG9P{t~u?C)dS*%sJam-mchdb~d&fE5s7kH>)r7 zJ5(@#m~KNn*|;`n`sI?Uv(1rOE0pRLLZsbKCDm*!&MnM-T$p!@C6)PHDXZXAa60%d R_&)d{I1`-pE9JS=&;Mw@l~e!#