Previous update missed the ModuleInfoSnapshotResolver update, leading to
broker OSGi functionality.
Update both callsites to directly derive root package name from the
advertized namespace.
JIRA: MDSAL-836
Change-Id: I520824b59018afd2d7afdf06173889f90fd70449
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
final var source = ModuleInfoSnapshotResolver.toYangTextSource(info);
mappedInfos.put(source.sourceId(), info);
final var source = ModuleInfoSnapshotResolver.toYangTextSource(info);
mappedInfos.put(source.sourceId(), info);
- final Class<?> infoClass = info.getClass();
- final String infoRoot = Naming.getModelRootPackageName(infoClass.getPackage().getName())
- .replace(Naming.SVC_PACKAGE_PREFIX, Naming.PACKAGE_PREFIX);
- classLoaders.put(infoRoot, infoClass.getClassLoader());
+ final String infoRoot = Naming.getRootPackageName(info.getName().getModule());
+ classLoaders.put(infoRoot, info.getClass().getClassLoader());
namespaces.put(infoRoot, info.getName().getModule());
try {
namespaces.put(infoRoot, info.getName().getModule());
try {
final var reg = regs.get(0);
final var info = reg.info;
moduleInfos.put(source, info);
final var reg = regs.get(0);
final var info = reg.info;
moduleInfos.put(source, info);
- final var infoClass = info.getClass();
- classLoaders.put(Naming.getModelRootPackageName(infoClass.getPackage().getName()),
- infoClass.getClassLoader());
+ classLoaders.put(Naming.getRootPackageName(info.getName().getModule()), info.getClass().getClassLoader());
}
final var next = new DefaultModuleInfoSnapshot(modelContext, moduleInfos, classLoaders);
}
final var next = new DefaultModuleInfoSnapshot(modelContext, moduleInfos, classLoaders);