From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 7 Nov 2015 12:32:25 +0000 (+0000)
Subject: Give CMS user priority with regard to access context
X-Git-Tag: argeo-commons-2.1.30~29
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=21198523496e5311afaa7bfa0f15f206ebc3b81f;p=lgpl%2Fargeo-commons.git

Give CMS user priority with regard to access context

git-svn-id: https://svn.argeo.org/commons/trunk@8561 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/org.argeo.cms/src/org/argeo/cms/auth/CurrentUser.java b/org.argeo.cms/src/org/argeo/cms/auth/CurrentUser.java
index cce34cd1f..8aa08728b 100644
--- a/org.argeo.cms/src/org/argeo/cms/auth/CurrentUser.java
+++ b/org.argeo.cms/src/org/argeo/cms/auth/CurrentUser.java
@@ -54,14 +54,12 @@ public final class CurrentUser {
 	}
 
 	private static Subject currentSubject() {
+		CmsView cmsView = CmsUtils.getCmsView();
+		if (cmsView != null)
+			return cmsView.getSubject();
 		Subject subject = Subject.getSubject(AccessController.getContext());
 		if (subject != null)
 			return subject;
-		if (subject == null) {
-			CmsView cmsView = CmsUtils.getCmsView();
-			if (cmsView != null)
-				return cmsView.getSubject();
-		}
 		throw new CmsException("Cannot find related subject");
 	}