zydronium/websitepanel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Few more narrow logic for task scheduler

Browse source
This commit is contained in:
robvde 2013-05-03 10:05:11 +04:00
parent 4934238323
commit cd08efa6eb
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Common/ObjectUtils.cs
View file

@ -384,7 +384,7 @@ namespace WebsitePanel.EnterpriseServer
Hashtable propValues = new Hashtable(); Hashtable propValues = new Hashtable();
foreach (DataRowView dr in dv) foreach (DataRowView dr in dv)
{ {
if (propValues[dr[nameColumn]] == null) if (propValues[dr[nameColumn]] == null && !propValues.ContainsKey(dr[nameColumn]))
propValues.Add(dr[nameColumn], dr[valueColumn]); propValues.Add(dr[nameColumn], dr[valueColumn]);
} }
@ -481,7 +481,7 @@ namespace WebsitePanel.EnterpriseServer
{ {
// check for persistent attribute // check for persistent attribute
object[] attrs = prop.GetCustomAttributes(typeof(PersistentAttribute), false); object[] attrs = prop.GetCustomAttributes(typeof(PersistentAttribute), false);
if (!persistentOnly || (persistentOnly && attrs.Length > 0)) if (!persistentOnly || (persistentOnly && attrs.Length > 0) && !props.ContainsKey(prop.Name))
{ {
// add property to hash // add property to hash
props.Add(prop.Name, prop); props.Add(prop.Name, prop);