commit 9ef13b77f011d30671256dbc9a690a9d2d566ee1
author Sagar Miglani <85228812+sagarmiglani@users.noreply.github.com> Fri Mar 11 16:14:59 2022 +0530
committer GitHub <noreply@github.com> Fri Mar 11 11:44:59 2022 +0100
tree 2d6497d68a78b9edc937234ce4c256839064a018
parent c6f9de104c26545f6d653929bf58759c0d9c8049

SLING-11132: Exception handling while clearing OSGiServiceReferences (#34)

* SLING-11132 - Exception handling while clearing OSGiServiceReferences
* SLING-11132 - Catch only IllegalStateException
* SLING-11132 - Remove log from catch block

src/main/java/org/apache/sling/models/impl/injectors/OSGiServiceInjector.java

diff --git a/src/main/java/org/apache/sling/models/impl/injectors/OSGiServiceInjector.java b/src/main/java/org/apache/sling/models/impl/injectors/OSGiServiceInjector.java
index 08f6d35..ce4d30d 100644
--- a/src/main/java/org/apache/sling/models/impl/injectors/OSGiServiceInjector.java
+++ b/src/main/java/org/apache/sling/models/impl/injectors/OSGiServiceInjector.java
@@ -204,7 +204,11 @@
         public void onDisposed() {
             if (refs != null) {
                 for (ServiceReference<?> ref : refs) {
-                    context.ungetService(ref);
+                    try {
+                        context.ungetService(ref);
+                    } catch (IllegalStateException exception) {
+                        // SLING-11132 - This exception is expected when BundleContext is no longer valid.
+                    }
                 }
             }
         }