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

Added ContainsKey check to Language Dictionary to fix a KeyAlreadyExists exception on app startup. Fixes work item 30195

Browse Source
This commit is contained in:
agrath@gmail.com
2011-06-16 11:45:01 -02:00
parent 940239f1f2
commit cdc4c86325
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
umbraco/cms/businesslogic/Dictionary.cs
View File

@@ -48,13 +48,16 @@ namespace umbraco.cms.businesslogic
dr.GetGuid("id"),
dr.GetGuid("parent"));
DictionaryItems.Add(item.key, item);
if (!DictionaryItems.ContainsKey(item.key))
{
DictionaryItems.Add(item.key, item);
}
}
}
cacheIsEnsured = true;
}
}
}
}
}
@@ -79,7 +82,7 @@ namespace umbraco.cms.businesslogic
/// </summary>
public class DictionaryItem
{
private string _key;
internal Guid UniqueId { get; private set; }
@@ -105,7 +108,7 @@ namespace umbraco.cms.businesslogic
ensureCache();
var item = DictionaryItems.Values.Cast<DictionaryItem>()
.Where(x => x.key == key)
.Where(x => x.key == key)
.SingleOrDefault();
if (item == null)
@@ -154,7 +157,7 @@ namespace umbraco.cms.businesslogic
this.id = item.id;
this._key = item.key;
this.ParentId = item.ParentId;
this.UniqueId = item.UniqueId;
this.UniqueId = item.UniqueId;
}
private DictionaryItem _parent;
@@ -244,7 +247,7 @@ namespace umbraco.cms.businesslogic
{
SqlHelper.ExecuteNonQuery("Update cmsDictionary set [key] = @key WHERE pk = @Id", SqlHelper.CreateParameter("@key", value),
SqlHelper.CreateParameter("@Id", id));
//remove the cached item since the key is different
DictionaryItems.Remove(key);
@@ -260,16 +263,16 @@ namespace umbraco.cms.businesslogic
dr.GetGuid("id"),
dr.GetGuid("parent"));
DictionaryItems.Add(item.key, item);
DictionaryItems.Add(item.key, item);
}
else
{
throw new DataException("Could not load updated created dictionary item with id " + id.ToString());
}
}
}
//finally update this objects value
this._key = value;
this._key = value;
}
}
else
@@ -449,7 +452,7 @@ namespace umbraco.cms.businesslogic
SqlHelper.CreateParameter("@parentId", parentId),
SqlHelper.CreateParameter("@dictionaryKey", key));
using (IRecordsReader dr =
using (IRecordsReader dr =
SqlHelper.ExecuteReader("Select pk, id, [key], parent from cmsDictionary where id=@id",
SqlHelper.CreateParameter("@id", newId)))
{
@@ -473,8 +476,8 @@ namespace umbraco.cms.businesslogic
{
throw new DataException("Could not load newly created dictionary item with id " + newId.ToString());
}
}
}
}
else
{
@@ -506,7 +509,7 @@ namespace umbraco.cms.businesslogic
{
if (Deleting != null)
Deleting(this, e);
}
}
#endregion
}
}