Fix resolver errors during bundle add-on installation (#4224)

Signed-off-by: Jan N. Klug <[email protected]>
openhab · May 11, 2024 · ec76747 · ec76747
1 parent 6eeb9dd
commit ec76747
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 14 deletions.
diff --git a/...rg.openhab.core.karaf/src/main/java/org/openhab/core/karaf/internal/FeatureInstaller.java b/...rg.openhab.core.karaf/src/main/java/org/openhab/core/karaf/internal/FeatureInstaller.java
@@ -195,15 +195,15 @@ private synchronized void processConfigQueue() {
             }
         }
 
-        processingConfigQueue.set(false);
-
         try {
             if (changed) {
                 featuresService.refreshFeatures(EnumSet.noneOf(FeaturesService.Option.class));
             }
         } catch (Exception e) {
             logger.error("Failed to refresh bundles after processing config update", e);
         }
+
+        processingConfigQueue.set(false);
     }
 
     public void addAddon(String type, String id) {

diff --git a/features/karaf/openhab-core/src/main/feature/feature.xml b/features/karaf/openhab-core/src/main/feature/feature.xml
@@ -519,19 +519,9 @@
 
 		<bundle>mvn:org.openhab.core.bundles/org.openhab.core.config.serial/${project.version}</bundle>
 		<bundle>mvn:org.openhab.core.bundles/org.openhab.core.config.discovery.usbserial/${project.version}</bundle>
-
-		<conditional>
-			<condition>req:osgi.native;filter:="(osgi.native.osname=Linux)"</condition>
-			<bundle>mvn:org.openhab.core.bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/${project.version}</bundle>
-		</conditional>
-
+		<bundle>mvn:org.openhab.core.bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/${project.version}</bundle>
 		<bundle>mvn:org.openhab.core.bundles/org.openhab.core.config.discovery.usbserial.ser2net/${project.version}</bundle>
-
-		<conditional>
-			<condition>req:osgi.native;filter:="(osgi.native.osname=Windows*)"</condition>
-			<bundle>mvn:org.openhab.core.bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/${project.version}</bundle>
-		</conditional>
-
+		<bundle>mvn:org.openhab.core.bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/${project.version}</bundle>
 		<bundle>mvn:org.openhab.core.bundles/org.openhab.core.io.transport.serial/${project.version}</bundle>
 		<bundle>mvn:org.openhab.core.bundles/org.openhab.core.io.transport.serial.rxtx/${project.version}</bundle>
 		<bundle>mvn:org.openhab.core.bundles/org.openhab.core.io.transport.serial.rxtx.rfc2217/${project.version}</bundle>