From 047d4527702c1b5806e6716e94cca9691b59dbc4 Mon Sep 17 00:00:00 2001 From: eeichinger Date: Mon, 3 Nov 2008 18:12:13 +0000 Subject: [PATCH] resolved SPRNET-1088 --- src/Spring/Spring.Core/Expressions/OpADD.cs | 2 +- .../Spring.Core.Tests/Expressions/ExpressionEvaluatorTests.cs | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Spring/Spring.Core/Expressions/OpADD.cs b/src/Spring/Spring.Core/Expressions/OpADD.cs index 2ff159cd..84fe8e56 100644 --- a/src/Spring/Spring.Core/Expressions/OpADD.cs +++ b/src/Spring/Spring.Core/Expressions/OpADD.cs @@ -78,7 +78,7 @@ namespace Spring.Expressions } else if (left is String || right is String) { - return left.ToString() + right.ToString(); + return string.Concat(left, right); } else if ((left is IList || left is ISet) && (right is IList || right is ISet)) { diff --git a/test/Spring/Spring.Core.Tests/Expressions/ExpressionEvaluatorTests.cs b/test/Spring/Spring.Core.Tests/Expressions/ExpressionEvaluatorTests.cs index a82d5d56..a0803ec1 100644 --- a/test/Spring/Spring.Core.Tests/Expressions/ExpressionEvaluatorTests.cs +++ b/test/Spring/Spring.Core.Tests/Expressions/ExpressionEvaluatorTests.cs @@ -1286,6 +1286,8 @@ namespace Spring.Expressions Assert.AreEqual("test 2", ExpressionEvaluator.GetValue(null, "'test' + ' ' + 2")); Assert.AreEqual("test " + DateTime.Today.ToString(), ExpressionEvaluator.GetValue(null, "'test' + ' ' + DateTime.Today")); + Assert.AreEqual("test", ExpressionEvaluator.GetValue(null, "'test' + #this")); // can concat null + Assert.AreEqual("test", ExpressionEvaluator.GetValue(null, "#this+'test'")); // can concat null // dates DateTime anaDOB = new DateTime(2004, 8, 14);