2009-12-02 Geoff Norton <gnorton@novell.com>

* VirtualMachineManager.cs: We might get a SocketException (interrupted) here, so lets just handle all Exceptions to our Accept pattern the same way svn path=/branches/mono-2-6/mcs/; revision=147527
mono · Dec 3, 2009 · 12ac0cf · 12ac0cf
1 parent db97682
commit 12ac0cf
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/mcs/class/Mono.Debugger.Soft/Mono.Debugger/ChangeLog b/mcs/class/Mono.Debugger.Soft/Mono.Debugger/ChangeLog
@@ -1,3 +1,9 @@
+2009-12-02  Geoff Norton  <gnorton@novell.com>
+
+	* VirtualMachineManager.cs: We might get a SocketException (interrupted)
+	here, so lets just handle all Exceptions to our Accept pattern the same
+	way
+
 2009-12-01  Zoltan Varga  <vargaz@gmail.com>
 
 	* VirtualMachine.cs (ErrorHandler): Handle NOT_SUSPENDED error code too.

diff --git a/mcs/class/Mono.Debugger.Soft/Mono.Debugger/VirtualMachineManager.cs b/mcs/class/Mono.Debugger.Soft/Mono.Debugger/VirtualMachineManager.cs
@@ -30,7 +30,7 @@ public static VirtualMachine LaunchInternal (Process p, Socket socket) {
 			Socket accepted = null;
 			try {
 				accepted = socket.Accept ();
-			} catch (ObjectDisposedException) {
+			} catch (Exception) {
 				throw;
 			}
 
@@ -111,7 +111,7 @@ public static VirtualMachine ListenInternal (Socket dbg_sock, Socket con_sock) {
 			if (con_sock != null) {
 				try {
 					con_acc = con_sock.Accept ();
-				} catch (ObjectDisposedException) {
+				} catch (Exception) {
 					try {
 						dbg_sock.Close ();
 					} catch {}
@@ -121,7 +121,7 @@ public static VirtualMachine ListenInternal (Socket dbg_sock, Socket con_sock) {
 
 			try {
 				dbg_acc = dbg_sock.Accept ();
-			} catch (ObjectDisposedException) {
+			} catch (Exception) {
 				if (con_sock != null) {
 					try {
 						con_sock.Close ();