From bea0266688b6ec47e792c53da8611c6a06fc74ec Mon Sep 17 00:00:00 2001
From: Sebastien Ros <sebros@microsoft.com>
Date: Fri, 16 Apr 2010 13:31:36 -0700
Subject: [PATCH] =?UTF-8?q?Added=20an=20=20ArgumentNullException=20sanity?=
 =?UTF-8?q?=20check=20to=20let=20devs=20know=20=20it=E2=80=99s=20not=20all?=
 =?UTF-8?q?owed=20here,=20and=20checked=20before=20calling=20the=20method.?=
 =?UTF-8?q?=20The=20standard=20validation=20pipeline=20does=20the=20rest?=
 =?UTF-8?q?=20as=20it=20is=20marked=20[Required]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Orchard.Web/Core/Common/Handlers/CommonAspectHandler.cs    | 3 ++-
 .../Modules/Orchard.Users/Services/MembershipService.cs        | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Orchard.Web/Core/Common/Handlers/CommonAspectHandler.cs b/src/Orchard.Web/Core/Common/Handlers/CommonAspectHandler.cs
index 4ad9f4337..a2f3d4366 100644
--- a/src/Orchard.Web/Core/Common/Handlers/CommonAspectHandler.cs
+++ b/src/Orchard.Web/Core/Common/Handlers/CommonAspectHandler.cs
@@ -172,7 +172,7 @@ namespace Orchard.Core.Common.Handlers {
             var priorOwner = viewModel.Owner;
             context.Updater.TryUpdateModel(viewModel, "CommonAspect", null, null);
 
-            if (viewModel.Owner != priorOwner) {
+            if (viewModel.Owner != null && viewModel.Owner != priorOwner) {
                 var newOwner = _membershipService.GetUser(viewModel.Owner);
                 if (newOwner == null) {
                     context.Updater.AddModelError("CommonAspect.Owner", T("Invalid user name"));
@@ -181,6 +181,7 @@ namespace Orchard.Core.Common.Handlers {
                     instance.Owner = newOwner;
                 }
             }
+
             context.AddEditor(new TemplateViewModel(viewModel, "CommonAspect") { TemplateName = "Parts/Common.Owner", ZoneName = "primary", Position = "999" });
         }
     }
diff --git a/src/Orchard.Web/Modules/Orchard.Users/Services/MembershipService.cs b/src/Orchard.Web/Modules/Orchard.Users/Services/MembershipService.cs
index 94eb85f91..3d44d1169 100644
--- a/src/Orchard.Web/Modules/Orchard.Users/Services/MembershipService.cs
+++ b/src/Orchard.Web/Modules/Orchard.Users/Services/MembershipService.cs
@@ -44,6 +44,9 @@ namespace Orchard.Users.Services {
         }
 
         public IUser GetUser(string username) {
+            if(username == null) {
+                throw new ArgumentNullException("username");
+            }
             var userRecord = _userRepository.Get(x => x.NormalizedUserName == username.ToLower());
             if (userRecord == null) {
                 return null;