XmlRpc*: Deprecate destructors used on things that implement IDisposable (Dispose function of superclass calls children's Close())

Author: nuclearmistake

ROS_Comm/XmlRpcManager.cs

@@ -456,6 +456,10 @@ public CachedXmlRpcClient(string host, int port, string uri)
         private CachedXmlRpcClient(XmlRpcClient c)
         {
             client = c;
+            client.Disposed += () =>
+                                   {
+                                       client = null;
+                                   };
         }
 
         /// <summary>

XmlRpc_Wrapper/XmlRpcClient.cs

@@ -28,7 +28,7 @@ namespace XmlRpc_Wrapper
     [DebuggerStepThrough]
 #endif
 
-    public class XmlRpcClient : XmlRpcSource //: IDisposable
+    public class XmlRpcClient : XmlRpcSource
     {
         // Static data
         private static string REQUEST_BEGIN = "<?xml version=\"1.0\"?>\r\n<methodCall><methodName>";
@@ -60,6 +60,8 @@ public class XmlRpcClient : XmlRpcSource //: IDisposable
         private string _uri;
         private HTTPHeader header;
         private TcpClient socket;
+        public delegate void DisposedEvent();
+        public event DisposedEvent Disposed;
 
         public XmlRpcClient(string HostName, int Port, string Uri)
         {
@@ -289,6 +291,9 @@ private int getPort()
         public override void Close()
         {
             XmlRpcUtil.log(XmlRpcUtil.XMLRPC_LOG_LEVEL.DEBUG, "XmlRpcClient::Close()");
+            close();
+            if (Disposed != null)
+                Disposed();
         }
 
         public override Socket getSocket()
@@ -326,7 +331,7 @@ public void close()
         {
             XmlRpcUtil.log(XmlRpcUtil.XMLRPC_LOG_LEVEL.DEBUG, "XmlRpcClient::close.");
             _connectionState = ConnectionState.NO_CONNECTION;
-
+            _disp.RemoveSource(this);
             _disp.Exit();
             //_disp.removeSource(this);
             //XmlRpcSource::close();

XmlRpc_Wrapper/XmlRpcServerConnection.cs

@@ -60,13 +60,6 @@ public override NetworkStream getStream()
             return stream;
         }
 
-
-        ~XmlRpcServerConnection()
-        {
-            XmlRpcUtil.log(XmlRpcUtil.XMLRPC_LOG_LEVEL.DEBUG, "XmlRpcServerConnection dtor.");
-            server.removeConnection(this);
-        }
-
         // Handle input on the server socket by accepting the connection
         // and reading the rpc request. Return true to continue to monitor
         // the socket for events, false to remove it from the dispatcher.
@@ -108,6 +101,7 @@ public override void Close()
                 socket.Close(100);
                 socket = null;
             }
+            server.removeConnection(this);
         }
 
         private bool readRequest()