X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FNodeRepositoryFactory.java;h=efbb724ff9174a751bad9ae639809e14b44fc443;hb=ed3d525b21f55ed76763381b91c888404487e3e1;hp=a6c722015f7fd6d9c3ec077f5ff522fc34659aad;hpb=d84d867f0b1c4d8a9b251260ef6d5679e40e5c42;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeRepositoryFactory.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeRepositoryFactory.java
index a6c722015..efbb724ff 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeRepositoryFactory.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeRepositoryFactory.java
@@ -26,23 +26,29 @@ import org.osgi.framework.ServiceReference;
  */
 class NodeRepositoryFactory implements RepositoryFactory {
 	private final Log log = LogFactory.getLog(getClass());
-	private final BundleContext bundleContext = FrameworkUtil.getBundle(getClass()).getBundleContext();
+//	private final BundleContext bundleContext = FrameworkUtil.getBundle(getClass()).getBundleContext();
 
 	// private Resource fileRepositoryConfiguration = new ClassPathResource(
 	// "/org/argeo/cms/internal/kernel/repository-localfs.xml");
 
 	protected Repository getRepositoryByAlias(String alias) {
-		try {
-			Collection<ServiceReference<Repository>> srs = bundleContext.getServiceReferences(Repository.class,
-					"(" + NodeConstants.CN + "=" + alias + ")");
-			if (srs.size() == 0)
-				throw new IllegalArgumentException("No repository with alias " + alias + " found in OSGi registry");
-			else if (srs.size() > 1)
-				throw new IllegalArgumentException(
-						srs.size() + " repositories with alias " + alias + " found in OSGi registry");
-			return bundleContext.getService(srs.iterator().next());
-		} catch (InvalidSyntaxException e) {
-			throw new IllegalArgumentException("Cannot find repository with alias " + alias, e);
+		BundleContext bundleContext = Activator.getBundleContext();
+		if (bundleContext != null) {
+			try {
+				Collection<ServiceReference<Repository>> srs = bundleContext.getServiceReferences(Repository.class,
+						"(" + NodeConstants.CN + "=" + alias + ")");
+				if (srs.size() == 0)
+					throw new IllegalArgumentException("No repository with alias " + alias + " found in OSGi registry");
+				else if (srs.size() > 1)
+					throw new IllegalArgumentException(
+							srs.size() + " repositories with alias " + alias + " found in OSGi registry");
+				return bundleContext.getService(srs.iterator().next());
+			} catch (InvalidSyntaxException e) {
+				throw new IllegalArgumentException("Cannot find repository with alias " + alias, e);
+			}
+		} else {
+			// TODO ability to filter static services
+			return null;
 		}
 	}