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

using val.value directly.

Browse Source
This commit is contained in:
Claus
2017-08-18 11:44:44 +02:00
parent 5a1fc91f3e
commit 528656a337
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Umbraco.Core/Services/IdkMap.cs
View File

@@ -45,13 +45,12 @@ namespace Umbraco.Core.Services
} }
if (val == null) return Attempt<int>.Fail(); if (val == null) return Attempt<int>.Fail();
id = new TypedId<int>(val.Value, umbracoObjectType);
try try
{ {
_locker.EnterWriteLock(); _locker.EnterWriteLock();
_id2Key[id.Id] = new TypedId<Guid>(key, umbracoObjectType); _id2Key[val.Value] = new TypedId<Guid>(key, umbracoObjectType);
_key2Id[key] = id; _key2Id[key] = new TypedId<int>(val.Value, umbracoObjectType);
} }
finally finally
{ {
@@ -59,7 +58,7 @@ namespace Umbraco.Core.Services
_locker.ExitWriteLock(); _locker.ExitWriteLock();
} }
return Attempt.Succeed(id.Id); return Attempt.Succeed(val.Value);
} }
public Attempt<int> GetIdForUdi(Udi udi) public Attempt<int> GetIdForUdi(Udi udi)
@@ -95,13 +94,12 @@ namespace Umbraco.Core.Services
} }
if (val == null) return Attempt<Guid>.Fail(); if (val == null) return Attempt<Guid>.Fail();
key = new TypedId<Guid>(val.Value, umbracoObjectType);
try try
{ {
_locker.EnterWriteLock(); _locker.EnterWriteLock();
_id2Key[id] = key; _id2Key[id] = new TypedId<Guid>(val.Value, umbracoObjectType); ;
_key2Id[key.Id] = new TypedId<int>(); _key2Id[val.Value] = new TypedId<int>();
} }
finally finally
{ {
@@ -109,7 +107,7 @@ namespace Umbraco.Core.Services
_locker.ExitWriteLock(); _locker.ExitWriteLock();
} }
return Attempt.Succeed(key.Id); return Attempt.Succeed(val.Value);
} }
private static Guid GetNodeObjectTypeGuid(UmbracoObjectTypes umbracoObjectType) private static Guid GetNodeObjectTypeGuid(UmbracoObjectTypes umbracoObjectType)