X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FDataModels.java;h=da6328163cc9804c8b95f877440b560f979f7d40;hb=4835aba6de0e6e2f7ef2da9e3bd19adca661c8bc;hp=5f5b95405c1ddb0bf4c134a9fceeb983c6b026d3;hpb=9a6babc07d80c6aa8c10adc12f40f84eef3619c5;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/DataModels.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/DataModels.java index 5f5b95405..da6328163 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/DataModels.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/DataModels.java @@ -8,6 +8,8 @@ import java.util.List; import java.util.Map; import java.util.TreeMap; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.argeo.cms.CmsException; import org.argeo.node.DataModelNamespace; import org.osgi.framework.Bundle; @@ -19,6 +21,8 @@ import org.osgi.framework.wiring.BundleWire; import org.osgi.framework.wiring.BundleWiring; class DataModels implements BundleListener { + private final static Log log = LogFactory.getLog(DataModels.class); + private Map dataModels = new TreeMap<>(); public DataModels(BundleContext bc) { @@ -56,6 +60,11 @@ class DataModels implements BundleListener { protected void processBundle(Bundle bundle) { BundleWiring wiring = bundle.adapt(BundleWiring.class); + if (wiring == null) { + log.warn("Bundle " + bundle.getSymbolicName() + " #" + bundle.getBundleId() + " (" + bundle.getLocation() + + ") cannot be adapted to a wiring"); + return; + } List providedDataModels = wiring.getCapabilities(CMS_DATA_MODEL_NAMESPACE); if (providedDataModels.size() == 0) return;