From feed5c5e511888befcc6b81b9476f44a0a7aba52 Mon Sep 17 00:00:00 2001
From: Morten Christensen <mc@sitereactor.dk>
Date: Sun, 8 Jun 2014 09:46:43 +0200
Subject: [PATCH] Fixes #U4-4593 EntityService.GetObjectType with passed in
 integer id or guid unique id

---
 src/Umbraco.Core/Services/EntityService.cs       |  8 ++++----
 src/Umbraco.Tests/Services/EntityServiceTests.cs | 10 ++++++++++
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Core/Services/EntityService.cs b/src/Umbraco.Core/Services/EntityService.cs
index 3837603d88..c78a55d6eb 100644
--- a/src/Umbraco.Core/Services/EntityService.cs
+++ b/src/Umbraco.Core/Services/EntityService.cs
@@ -367,8 +367,8 @@ namespace Umbraco.Core.Services
             using (var uow = _uowProvider.GetUnitOfWork())
             {
                 var sql = new Sql().Select("nodeObjectType").From<NodeDto>().Where<NodeDto>(x => x.NodeId == id);
-                var nodeObjectTypeId = uow.Database.ExecuteScalar<string>(sql);
-                var objectTypeId = new Guid(nodeObjectTypeId);
+                var nodeObjectTypeId = uow.Database.ExecuteScalar<Guid>(sql);
+                var objectTypeId = nodeObjectTypeId;
                 return UmbracoObjectTypesExtensions.GetUmbracoObjectType(objectTypeId);
             }
         }
@@ -383,8 +383,8 @@ namespace Umbraco.Core.Services
             using (var uow = _uowProvider.GetUnitOfWork())
             {
                 var sql = new Sql().Select("nodeObjectType").From<NodeDto>().Where<NodeDto>(x => x.UniqueId == key);
-                var nodeObjectTypeId = uow.Database.ExecuteScalar<string>(sql);
-                var objectTypeId = new Guid(nodeObjectTypeId);
+                var nodeObjectTypeId = uow.Database.ExecuteScalar<Guid>(sql);
+                var objectTypeId = nodeObjectTypeId;
                 return UmbracoObjectTypesExtensions.GetUmbracoObjectType(objectTypeId);
             }
         }
diff --git a/src/Umbraco.Tests/Services/EntityServiceTests.cs b/src/Umbraco.Tests/Services/EntityServiceTests.cs
index 9826e9fc3f..0a34b59063 100644
--- a/src/Umbraco.Tests/Services/EntityServiceTests.cs
+++ b/src/Umbraco.Tests/Services/EntityServiceTests.cs
@@ -138,6 +138,16 @@ namespace Umbraco.Tests.Services
                         && ((UmbracoEntity.EntityProperty)y.Value).PropertyEditorAlias == Constants.PropertyEditors.UploadFieldAlias)), Is.True);
         }
 
+        [Test]
+        public void EntityService_Can_Get_ObjectType()
+        {
+            var service = ServiceContext.EntityService;
+            var mediaObjectType = service.GetObjectType(1031);
+
+            Assert.NotNull(mediaObjectType);
+            Assert.AreEqual(mediaObjectType, UmbracoObjectTypes.MediaType);
+        }
+
         private static bool _isSetup = false;
 
         public override void CreateTestData()