diff options
| author | fcolin | 2011-11-25 13:15:50 +0000 |
|---|---|---|
| committer | fcolin | 2011-11-25 13:15:50 +0000 |
| commit | ac2b3c25d3c1fef9012ca225d9a0430a123a435a (patch) | |
| tree | b3868780c182a0e7cc6d53c35ad5c0e685f156bd | |
| parent | 6daab2a09e45170ef668479e659f63db8908aed8 (diff) | |
| download | ivy-csharp-ac2b3c25d3c1fef9012ca225d9a0430a123a435a.zip ivy-csharp-ac2b3c25d3c1fef9012ca225d9a0430a123a435a.tar.gz ivy-csharp-ac2b3c25d3c1fef9012ca225d9a0430a123a435a.tar.bz2 ivy-csharp-ac2b3c25d3c1fef9012ca225d9a0430a123a435a.tar.xz | |
correct bug on Close in mono Linux Env
| -rw-r--r-- | Ivy/Ivy.cs | 4 | ||||
| -rw-r--r-- | Ivy/Ivy.csproj | 3 | ||||
| -rw-r--r-- | Ivy/IvyTCPStreamV3.cs | 4 | ||||
| -rw-r--r-- | Ivy/IvyTCPStreamV4.cs | 3 | ||||
| -rw-r--r-- | Ivy/Properties/Resources.Designer.cs | 2 | ||||
| -rw-r--r-- | Ivy/Properties/Settings.Designer.cs | 2 |
6 files changed, 13 insertions, 5 deletions
@@ -506,6 +506,10 @@ namespace IvyBus /// </remarks>
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 @@ <OldToolsVersion>3.5</OldToolsVersion>
<IsWebBootstrapper>false</IsWebBootstrapper>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
- <TargetFrameworkProfile />
+ <TargetFrameworkProfile>
+ </TargetFrameworkProfile>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
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 @@ //------------------------------------------------------------------------------
// <auto-generated>
// 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 @@ //------------------------------------------------------------------------------
// <auto-generated>
// 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é.
|