From ac2b3c25d3c1fef9012ca225d9a0430a123a435a Mon Sep 17 00:00:00 2001 From: fcolin Date: Fri, 25 Nov 2011 13:15:50 +0000 Subject: correct bug on Close in mono Linux Env --- Ivy/Ivy.cs | 4 ++++ Ivy/Ivy.csproj | 3 ++- Ivy/IvyTCPStreamV3.cs | 4 +++- Ivy/IvyTCPStreamV4.cs | 3 ++- Ivy/Properties/Resources.Designer.cs | 2 +- Ivy/Properties/Settings.Designer.cs | 2 +- 6 files changed, 13 insertions(+), 5 deletions(-) diff --git a/Ivy/Ivy.cs b/Ivy/Ivy.cs index e8590f6..0b1818a 100644 --- a/Ivy/Ivy.cs +++ b/Ivy/Ivy.cs @@ -506,6 +506,10 @@ namespace IvyBus /// public void Start(string domainBus) { + if (string.IsNullOrEmpty(AppName)) + { + AppName = "LazyDevelopper"; + } // check for ReadyMessage empty if (string.IsNullOrEmpty(ready_message)) { diff --git a/Ivy/Ivy.csproj b/Ivy/Ivy.csproj index d2c51d5..563e87f 100644 --- a/Ivy/Ivy.csproj +++ b/Ivy/Ivy.csproj @@ -36,7 +36,8 @@ 3.5 false v2.0 - + + publish\ true Disk diff --git a/Ivy/IvyTCPStreamV3.cs b/Ivy/IvyTCPStreamV3.cs index 6c23726..aa76e93 100644 --- a/Ivy/IvyTCPStreamV3.cs +++ b/Ivy/IvyTCPStreamV3.cs @@ -35,8 +35,10 @@ namespace IvyBus { this.output.Close(); this.input.Close(); - this.Socket.Shutdown(SocketShutdown.Both); + if ( this.Socket != null ) // Correct problem in Mono ( under linux ) + this.Socket.Shutdown(SocketShutdown.Both); base.Close(); + } /* the protocol magic numbers */ diff --git a/Ivy/IvyTCPStreamV4.cs b/Ivy/IvyTCPStreamV4.cs index 20526c7..3550443 100644 --- a/Ivy/IvyTCPStreamV4.cs +++ b/Ivy/IvyTCPStreamV4.cs @@ -50,7 +50,8 @@ namespace IvyBus { this.output.Close(); this.input.Close(); - this.Socket.Shutdown(SocketShutdown.Both); + if (this.Socket != null) // Correct problem in Mono ( under linux ) + this.Socket.Shutdown(SocketShutdown.Both); base.Close(); } diff --git a/Ivy/Properties/Resources.Designer.cs b/Ivy/Properties/Resources.Designer.cs index 6738c78..a7328c7 100644 --- a/Ivy/Properties/Resources.Designer.cs +++ b/Ivy/Properties/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // Ce code a été généré par un outil. -// Version du runtime :4.0.30319.225 +// Version du runtime :4.0.30319.239 // // Les modifications apportées à ce fichier peuvent provoquer un comportement incorrect et seront perdues si // le code est régénéré. diff --git a/Ivy/Properties/Settings.Designer.cs b/Ivy/Properties/Settings.Designer.cs index af554b4..f791f69 100644 --- a/Ivy/Properties/Settings.Designer.cs +++ b/Ivy/Properties/Settings.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // Ce code a été généré par un outil. -// Version du runtime :4.0.30319.225 +// Version du runtime :4.0.30319.239 // // Les modifications apportées à ce fichier peuvent provoquer un comportement incorrect et seront perdues si // le code est régénéré. -- cgit v1.1