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

fixed SPRNET-1073

Browse Source
This commit is contained in:
eeichinger
2009-07-28 17:08:05 +00:00
parent c0188c44cb
commit de0a3bfa41
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/Spring/Spring.Core/Validation/ValidationErrors.cs
View File

@@ -208,22 +208,35 @@ namespace Spring.Validation
/// <param name="errorsToMerge">
/// The validation errors to merge; can be <see lang="null"/>.
/// </param>
public void MergeErrors(ValidationErrors errorsToMerge)
public void MergeErrors(IValidationErrors errorsToMerge)
{
if (errorsToMerge != null)
{
foreach (DictionaryEntry errorEntry in errorsToMerge.errorMap)
foreach(string provider in errorsToMerge.Providers)
{
ArrayList errList = (ArrayList) this.errorMap[errorEntry.Key];
ArrayList errList = (ArrayList) this.errorMap[provider];
IList other = errorsToMerge.GetErrors(provider);
if (errList == null)
{
this.errorMap[errorEntry.Key] = errorEntry.Value;
this.errorMap[provider] = other;
}
else
{
errList.AddRange((IList) errorEntry.Value);
errList.AddRange((IList) other);
}
}
// foreach (DictionaryEntry errorEntry in errorsToMerge.errorMap)
// {
// ArrayList errList = (ArrayList) this.errorMap[errorEntry.Key];
// if (errList == null)
// {
// this.errorMap[errorEntry.Key] = errorEntry.Value;
// }
// else
// {
// errList.AddRange((IList) errorEntry.Value);
// }
// }
}
}