X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fauth%2FCurrentUser.java;h=8aa08728b79846eace2b4e970c6223de4ef5fa34;hb=a52f72fd8d7d5d6732817e331336e039b0005443;hp=cce34cd1fb298c81fd01f98147d2710bd97c4275;hpb=fd15f02e9bcff9268ef4b87d7dec29b76be57862;p=lgpl%2Fargeo-commons.git

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");
 	}