finalizers

honfika · honfika · commit 9d2b5340bf83 · 2022-01-30T23:35:31.000+01:00
diff --git a/src/Titanium.Web.Proxy/EventArguments/SessionEventArgs.cs b/src/Titanium.Web.Proxy/EventArguments/SessionEventArgs.cs
@@ -684,7 +684,7 @@ public void TerminateServerConnection()
             HttpClient.CloseServerConnection = true;
         }
 
-        private bool disposed = false;
+        private bool disposed;
         
         protected override void Dispose(bool disposing)
         {
@@ -701,6 +701,11 @@ protected override void Dispose(bool disposing)
 
         ~SessionEventArgs()
         {
+#if DEBUG
+            // Finalizer should not be called
+            System.Diagnostics.Debugger.Break();
+#endif
+
             Dispose(false);
         }
     }
diff --git a/src/Titanium.Web.Proxy/EventArguments/SessionEventArgsBase.cs b/src/Titanium.Web.Proxy/EventArguments/SessionEventArgsBase.cs
@@ -181,6 +181,11 @@ public void Dispose()
 
         ~SessionEventArgsBase()
         {
+#if DEBUG
+            // Finalizer should not be called
+            System.Diagnostics.Debugger.Break();
+#endif
+
             Dispose(false);
         }
 
diff --git a/src/Titanium.Web.Proxy/EventArguments/TunnelConnectEventArgs.cs b/src/Titanium.Web.Proxy/EventArguments/TunnelConnectEventArgs.cs
@@ -75,5 +75,15 @@ internal void OnDecryptedDataReceived(byte[] buffer, int offset, int count)
                 ExceptionFunc(new Exception("Exception thrown in user event", ex));
             }
         }
+
+        ~TunnelConnectSessionEventArgs()
+        {
+#if DEBUG
+            // Finalizer should not be called
+            System.Diagnostics.Debugger.Break();
+#endif
+
+            Dispose(false);
+        }
     }
 }
diff --git a/src/Titanium.Web.Proxy/ExplicitClientHandler.cs b/src/Titanium.Web.Proxy/ExplicitClientHandler.cs
@@ -38,10 +38,10 @@ private async Task handleClient(ExplicitProxyEndPoint endPoint, TcpClientConnect
             Task<TcpServerConnection?>? prefetchConnectionTask = null;
             bool closeServerConnection = false;
 
+            TunnelConnectSessionEventArgs? connectArgs = null;
+
             try
             {
-                TunnelConnectSessionEventArgs? connectArgs = null;
-
                 var method = await HttpHelper.GetMethod(clientStream, BufferPool, cancellationToken);
                 if (clientStream.IsClosed)
                 {
@@ -402,6 +402,7 @@ await Http2Helper.SendHttp2(clientStream, connection.Stream,
                 await tcpConnectionFactory.Release(prefetchConnectionTask, closeServerConnection);
 
                 clientStream.Dispose();
+                connectArgs?.Dispose();
             }
         }
     }
diff --git a/src/Titanium.Web.Proxy/Network/Streams/CopyStream.cs b/src/Titanium.Web.Proxy/Network/Streams/CopyStream.cs
@@ -88,6 +88,11 @@ public void Dispose()
 
         ~CopyStream()
         {
+#if DEBUG
+            // Finalizer should not be called
+            System.Diagnostics.Debugger.Break();
+#endif
+
             Dispose(false);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -684,7 +684,7 @@ public void TerminateServerConnection()`
`684`	`684`	`HttpClient.CloseServerConnection = true;`
`685`	`685`	`}`
`686`	`686`
`687`		`- private bool disposed = false;`
	`687`	`+ private bool disposed;`
`688`	`688`
`689`	`689`	`protected override void Dispose(bool disposing)`
`690`	`690`	`{`
`@@ -701,6 +701,11 @@ protected override void Dispose(bool disposing)`
`701`	`701`
`702`	`702`	`~SessionEventArgs()`
`703`	`703`	`{`
	`704`	`+#if DEBUG`
	`705`	`+ // Finalizer should not be called`
	`706`	`+ System.Diagnostics.Debugger.Break();`
	`707`	`+#endif`
	`708`	`+`
`704`	`709`	`Dispose(false);`
`705`	`710`	`}`
`706`	`711`	`}`
Original file line number	Diff line number	Diff line change
`@@ -181,6 +181,11 @@ public void Dispose()`
`181`	`181`
`182`	`182`	`~SessionEventArgsBase()`
`183`	`183`	`{`
	`184`	`+#if DEBUG`
	`185`	`+ // Finalizer should not be called`
	`186`	`+ System.Diagnostics.Debugger.Break();`
	`187`	`+#endif`
	`188`	`+`
`184`	`189`	`Dispose(false);`
`185`	`190`	`}`
`186`	`191`
Original file line number	Diff line number	Diff line change
`@@ -75,5 +75,15 @@ internal void OnDecryptedDataReceived(byte[] buffer, int offset, int count)`
`75`	`75`	`ExceptionFunc(new Exception("Exception thrown in user event", ex));`
`76`	`76`	`}`
`77`	`77`	`}`
	`78`	`+`
	`79`	`+ ~TunnelConnectSessionEventArgs()`
	`80`	`+ {`
	`81`	`+#if DEBUG`
	`82`	`+ // Finalizer should not be called`
	`83`	`+ System.Diagnostics.Debugger.Break();`
	`84`	`+#endif`
	`85`	`+`
	`86`	`+ Dispose(false);`
	`87`	`+ }`
`78`	`88`	`}`
`79`	`89`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,10 +38,10 @@ private async Task handleClient(ExplicitProxyEndPoint endPoint, TcpClientConnect`
`38`	`38`	`Task<TcpServerConnection?>? prefetchConnectionTask = null;`
`39`	`39`	`bool closeServerConnection = false;`
`40`	`40`
	`41`	`+ TunnelConnectSessionEventArgs? connectArgs = null;`
	`42`	`+`
`41`	`43`	`try`
`42`	`44`	`{`
`43`		`- TunnelConnectSessionEventArgs? connectArgs = null;`
`44`		`-`
`45`	`45`	`var method = await HttpHelper.GetMethod(clientStream, BufferPool, cancellationToken);`
`46`	`46`	`if (clientStream.IsClosed)`
`47`	`47`	`{`
`@@ -402,6 +402,7 @@ await Http2Helper.SendHttp2(clientStream, connection.Stream,`
`402`	`402`	`await tcpConnectionFactory.Release(prefetchConnectionTask, closeServerConnection);`
`403`	`403`
`404`	`404`	`clientStream.Dispose();`
	`405`	`+ connectArgs?.Dispose();`
`405`	`406`	`}`
`406`	`407`	`}`
`407`	`408`	`}`
Original file line number	Diff line number	Diff line change
`@@ -88,6 +88,11 @@ public void Dispose()`
`88`	`88`
`89`	`89`	`~CopyStream()`
`90`	`90`	`{`
	`91`	`+#if DEBUG`
	`92`	`+ // Finalizer should not be called`
	`93`	`+ System.Diagnostics.Debugger.Break();`
	`94`	`+#endif`
	`95`	`+`
`91`	`96`	`Dispose(false);`
`92`	`97`	`}`
`93`	`98`	`}`