This is an automated email from the ASF dual-hosted git repository. tjwatson pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git
from f155c61cfb FELIX-6796 : Improve shutdown handling add d7504bade3 Add testcase for FELIX-6726 add 5890c44b60 Ignore IllegalArgumentException on unget service new 95469d0c74 Merge pull request #436 from tjwatson/ignoreIllegalArgumentException The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: scr/pom.xml | 2 +- .../impl/helper/ComponentServiceObjectsHelper.java | 3 +- .../scr/impl/manager/AbstractPrototypeRefPair.java | 19 ++++--- .../felix/scr/integration/ComponentTestBase.java | 13 ++--- .../{Felix3680Test.java => Felix6726Test.java} | 48 ++++++++--------- .../components/{felix5276 => felix6726}/A.java | 47 ++++++++--------- .../{felix5276/A.java => felix6726/B.java} | 47 ++++++++--------- .../{felix5276/A.java => felix6726/BImpl.java} | 4 +- .../{felix5276/A.java => felix6726/Consumer.java} | 53 ++++++++++--------- ...IX_5276.xml => integration_test_FELIX_6726.xml} | 61 ++++++++-------------- 10 files changed, 142 insertions(+), 155 deletions(-) copy scr/src/test/java/org/apache/felix/scr/integration/{Felix3680Test.java => Felix6726Test.java} (56%) copy scr/src/test/java/org/apache/felix/scr/integration/components/{felix5276 => felix6726}/A.java (88%) copy scr/src/test/java/org/apache/felix/scr/integration/components/{felix5276/A.java => felix6726/B.java} (87%) copy scr/src/test/java/org/apache/felix/scr/integration/components/{felix5276/A.java => felix6726/BImpl.java} (89%) copy scr/src/test/java/org/apache/felix/scr/integration/components/{felix5276/A.java => felix6726/Consumer.java} (80%) copy scr/src/test/resources/{integration_test_FELIX_5276.xml => integration_test_FELIX_6726.xml} (51%)