summaryrefslogtreecommitdiff
path: root/Ivy
diff options
context:
space:
mode:
authorfcolin2009-11-09 14:05:41 +0000
committerfcolin2009-11-09 14:05:41 +0000
commitaef33c772bd9b7d096b314c529cc91c98e773cd0 (patch)
treecfe93ef67b83d3503fdf5c8586c59a9d5a7ddb84 /Ivy
parente43e96cc06de8ffbd93ff957a6ba7ee1d2503331 (diff)
downloadivy-csharp-aef33c772bd9b7d096b314c529cc91c98e773cd0.zip
ivy-csharp-aef33c772bd9b7d096b314c529cc91c98e773cd0.tar.gz
ivy-csharp-aef33c772bd9b7d096b314c529cc91c98e773cd0.tar.bz2
ivy-csharp-aef33c772bd9b7d096b314c529cc91c98e773cd0.tar.xz
correction type de message du message Error
modification comportement en cas d'errur de compile sur expression reguliere -> msg error au lieu d'exception et fermeture du client
Diffstat (limited to 'Ivy')
-rw-r--r--Ivy/IvyClient.cs3
-rw-r--r--Ivy/IvyTCPStreamV3.cs2
-rw-r--r--Ivy/IvyTCPStreamV4.cs2
3 files changed, 4 insertions, 3 deletions
diff --git a/Ivy/IvyClient.cs b/Ivy/IvyClient.cs
index 5671b6f..93f62ca 100644
--- a/Ivy/IvyClient.cs
+++ b/Ivy/IvyClient.cs
@@ -502,7 +502,8 @@ namespace IvyBus
}
catch (ArgumentException ex)
{
- throw new IvyException("binding expression error " + ex.Message);
+ //throw new IvyException("binding expression error " + ex.Message);
+ stream.TokenError(7, Resources.BadExpression + " "+ ex.Message);
}
}
diff --git a/Ivy/IvyTCPStreamV3.cs b/Ivy/IvyTCPStreamV3.cs
index 7f90a94..e261f5e 100644
--- a/Ivy/IvyTCPStreamV3.cs
+++ b/Ivy/IvyTCPStreamV3.cs
@@ -142,7 +142,7 @@ namespace IvyBus
void IvyProtocol.TokenError(int key, string arg)
{
- this.SendMsg(MessageType.Msg, key, arg);
+ this.SendMsg(MessageType.Error, key, arg);
}
private int DeserializeInt()
diff --git a/Ivy/IvyTCPStreamV4.cs b/Ivy/IvyTCPStreamV4.cs
index 2b1640a..65e325c 100644
--- a/Ivy/IvyTCPStreamV4.cs
+++ b/Ivy/IvyTCPStreamV4.cs
@@ -150,7 +150,7 @@ namespace IvyBus
void IvyProtocol.TokenError(int key, string arg)
{
- sendMsg(MessageType.Msg, key, arg);
+ sendMsg(MessageType.Error, key, arg);
}
private int DeserializeInt()