Spring/spring-net
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

resolved SPRNET-1088

Browse Source
This commit is contained in:
eeichinger
2008-11-03 18:12:13 +00:00
parent 9ac910ee02
commit 047d452770
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Spring/Spring.Core/Expressions/OpADD.cs
View File

@@ -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))
{

2
test/Spring/Spring.Core.Tests/Expressions/ExpressionEvaluatorTests.cs
View File

@@ -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);