commit 01577eef2811982f279eb59b711aedcd862b698e
author Thomas Watson <tjwatson@us.ibm.com> Thu Jan 18 09:46:42 2024 -0600
committer GitHub <noreply@github.com> Thu Jan 18 09:46:42 2024 -0600
tree 120ecab0cf8f7c714d0859066fe02314d29f8dec
parent 8b598e8628a3388b89cd8d0f0911d5cd62fc188e
parent ad746d6a44a8f2e013aff56cddb56c7bb34d83e9

Merge pull request #291 from tjwatson/scrFix6682

Fix for issue 6682 to properly throw IllegalArgumentException

scr/pom.xml

diff --git a/scr/pom.xml b/scr/pom.xml
index f80f65d..219f2db 100644
--- a/scr/pom.xml
+++ b/scr/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.apache.felix</groupId>
         <artifactId>felix-parent</artifactId>
-        <version>6</version>
+        <version>8</version>
         <relativePath />
     </parent>
     <modelVersion>4.0.0</modelVersion>

scr/src/main/java/org/apache/felix/scr/impl/helper/ComponentServiceObjectsHelper.java

diff --git a/scr/src/main/java/org/apache/felix/scr/impl/helper/ComponentServiceObjectsHelper.java b/scr/src/main/java/org/apache/felix/scr/impl/helper/ComponentServiceObjectsHelper.java
index cf5fea7..7f32e6c 100644
--- a/scr/src/main/java/org/apache/felix/scr/impl/helper/ComponentServiceObjectsHelper.java
+++ b/scr/src/main/java/org/apache/felix/scr/impl/helper/ComponentServiceObjectsHelper.java
@@ -211,9 +211,7 @@
                 {
                     remove = instances.remove(service);
                 }
-                if ( remove ) {
-                    so.ungetService(service);
-                }
+                so.ungetService(service);
             }
         }