yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #802 from tmoxon/dev-v7

Browse Source 
Null check to prevent object reference error with public properties on custom indexers
This commit is contained in:
Shannon Deminick
2015-10-19 18:05:33 +02:00
parent 6a351bede1 6a931273a6
commit 2176f2a1c9
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Umbraco.Web/WebServices/ExamineManagementApiController.cs
View File

@@ -258,9 +258,16 @@ namespace Umbraco.Web.WebServices
//ignore these properties
.Where(x => new[] {"IndexerData", "Description", "WorkingFolder"}.InvariantContains(x.Name) == false)
.OrderBy(x => x.Name);
foreach (var p in props)
{
indexerModel.ProviderProperties.Add(p.Name, p.GetValue(indexer, null).ToString());
var val = p.GetValue(indexer, null);
if (val == null)
{
LogHelper.Warn<ExamineManagementApiController>("Property value was null when setting up property on indexer: " + indexer.Name + " property: " + p.Name);
val = string.Empty;
}
indexerModel.ProviderProperties.Add(p.Name, val.ToString());
}
var luceneIndexer = indexer as LuceneIndexer;