X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fauth%2FRemoteAuthUtils.java;h=6274bb146e736165214fcabd52f49c20edb3e5d8;hb=c2366f32052deada7d96f635e86f745f438f094e;hp=d51997d74fca518340fc5f601e649c7e30dd6480;hpb=b843d903237a2a4192c40d8c933e71137284050b;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/auth/RemoteAuthUtils.java b/org.argeo.cms/src/org/argeo/cms/auth/RemoteAuthUtils.java
index d51997d74..6274bb146 100644
--- a/org.argeo.cms/src/org/argeo/cms/auth/RemoteAuthUtils.java
+++ b/org.argeo.cms/src/org/argeo/cms/auth/RemoteAuthUtils.java
@@ -8,14 +8,12 @@ import java.util.function.Supplier;
 import javax.security.auth.Subject;
 
 import org.argeo.api.cms.CmsSession;
-import org.argeo.cms.osgi.CmsOsgiUtils;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.FrameworkUtil;
+import org.argeo.cms.internal.runtime.CmsContextImpl;
 
 /** Remote authentication utilities. */
 public class RemoteAuthUtils {
 	static final String REMOTE_USER = "org.osgi.service.http.authentication.remote.user";
-	private static BundleContext bundleContext = FrameworkUtil.getBundle(RemoteAuthUtils.class).getBundleContext();
+//	private static BundleContext bundleContext = FrameworkUtil.getBundle(RemoteAuthUtils.class).getBundleContext();
 
 	/**
 	 * Execute this supplier, using the CMS class loader as context classloader.
@@ -58,7 +56,7 @@ public class RemoteAuthUtils {
 	public static CmsSession getCmsSession(RemoteAuthRequest req) {
 		Subject subject = Subject
 				.getSubject((AccessControlContext) req.getAttribute(AccessControlContext.class.getName()));
-		CmsSession cmsSession = CmsOsgiUtils.getCmsSession(bundleContext, subject);
+		CmsSession cmsSession = CmsContextImpl.getCmsContext().getCmsSession(subject);
 		return cmsSession;
 	}
 }