X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fruntime%2FCmsContextImpl.java;h=bd54b20594b5e7200d0a3e04f975e8cfc13ab354;hb=5b6b49fa655c7b3ae3dcc06d6c504e3d0225684f;hp=c2d2ccf42d4cdd2814e6c4806d366bf9385d935d;hpb=fbdca9fcba285280f1d113671ef3ba7a670e45c7;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsContextImpl.java b/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsContextImpl.java
index c2d2ccf42..bd54b2059 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsContextImpl.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsContextImpl.java
@@ -25,19 +25,18 @@ import org.argeo.cms.internal.auth.CmsSessionImpl;
 import org.ietf.jgss.GSSCredential;
 import org.osgi.service.useradmin.UserAdmin;
 
+/** Reference implementation of {@link CmsContext}. */
 public class CmsContextImpl implements CmsContext {
 
 	private final CmsLog log = CmsLog.getLog(getClass());
 
 	private static CompletableFuture<CmsContextImpl> instance = new CompletableFuture<CmsContextImpl>();
-//	private static CmsContextImpl instance = null;
 
 	private CmsState cmsState;
 	private CmsDeployment cmsDeployment;
 	private UserAdmin userAdmin;
 	private UuidFactory uuidFactory;
 	private CmsEventBus cmsEventBus;
-//	private ProvidedRepository contentRepository;
 
 	// i18n
 	private Locale defaultLocale;
@@ -64,9 +63,6 @@ public class CmsContextImpl implements CmsContext {
 				}
 			}
 		}, "Check readiness").start();
-
-		// checkReadiness();
-
 		setInstance(this);
 	}
 
@@ -178,14 +174,6 @@ public class CmsContextImpl implements CmsContext {
 		this.uuidFactory = uuidFactory;
 	}
 
-//	public ProvidedRepository getContentRepository() {
-//		return contentRepository;
-//	}
-//
-//	public void setContentRepository(ProvidedRepository contentRepository) {
-//		this.contentRepository = contentRepository;
-//	}
-
 	@Override
 	public Locale getDefaultLocale() {
 		return defaultLocale;
@@ -238,15 +226,6 @@ public class CmsContextImpl implements CmsContext {
 	}
 
 	private static void setInstance(CmsContextImpl cmsContextImpl) {
-//		if (cmsContextImpl != null) {
-//			if (instance != null)
-//				throw new IllegalStateException("CMS Context is already set");
-//			instance = cmsContextImpl;
-//		} else {
-//			instance = null;
-//		}
-//		CmsContextImpl.class.notifyAll();
-
 		if (cmsContextImpl != null) {
 			if (instance.isDone())
 				throw new IllegalStateException("CMS Context is already set");
@@ -259,15 +238,6 @@ public class CmsContextImpl implements CmsContext {
 	}
 
 	private static CmsContextImpl getInstance() {
-//		while (instance == null) {
-//			try {
-//				CmsContextImpl.class.wait();
-//			} catch (InterruptedException e) {
-//				throw new IllegalStateException("Cannot wait for CMS context instance", e);
-//			}
-//		}
-//		return instance;
-
 		try {
 			return instance.get();
 		} catch (InterruptedException | ExecutionException e) {