summaryrefslogtreecommitdiff
path: root/CSharp
diff options
context:
space:
mode:
authorfcolin2007-02-01 09:46:19 +0000
committerfcolin2007-02-01 09:46:19 +0000
commite126c87932017573b1d4a3138dc149a514a5e9aa (patch)
tree3712e9a09bacfce3d9b3e7e48e3dbc6b585b8d63 /CSharp
parentef36cded337e0ff85199fb16ebfb3296789083ff (diff)
downloadivy-csharp-e126c87932017573b1d4a3138dc149a514a5e9aa.zip
ivy-csharp-e126c87932017573b1d4a3138dc149a514a5e9aa.tar.gz
ivy-csharp-e126c87932017573b1d4a3138dc149a514a5e9aa.tar.bz2
ivy-csharp-e126c87932017573b1d4a3138dc149a514a5e9aa.tar.xz
Utilisateur : Fcolin Date : 7/11/03 Heure : 17:51 Archivé dans $/EScribe/Ivy Commentaire: (vss 12)
Diffstat (limited to 'CSharp')
-rw-r--r--CSharp/Ivy/Ivy/IvyClient.cs11
1 files changed, 7 insertions, 4 deletions
diff --git a/CSharp/Ivy/Ivy/IvyClient.cs b/CSharp/Ivy/Ivy/IvyClient.cs
index eabdfb1..3d541d0 100644
--- a/CSharp/Ivy/Ivy/IvyClient.cs
+++ b/CSharp/Ivy/Ivy/IvyClient.cs
@@ -228,6 +228,7 @@ namespace IvyBus
stopListening();
// bus.clientDisconnect(this);
socket.Close(); // should I also close in and out ?
+ socket = null;
}
/// <summary> sends the substrings of a message to the peer for each matching regexp.
@@ -262,10 +263,12 @@ namespace IvyBus
clientThread = null;
// Tell newThread to go to sleep.
running = false;
- t.Interrupt();
- // Wait for newThread to end.
- t.Join();
-
+ if ( Thread.CurrentThread != t )
+ {
+ t.Interrupt();
+ // Wait for newThread to end.
+ t.Join();
+ }
}
/// <summary> compares two peers the id is the couple (host,service port).