Avoid returning null too early in OSGi case

Signed-off-by: Lukas Jungmann <[email protected]>
jakartaee · Feb 20, 2021 · 77a7998 · 77a7998
1 parent e537f6b
commit 77a7998
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/api/src/main/java/jakarta/xml/soap/FactoryFinder.java b/api/src/main/java/jakarta/xml/soap/FactoryFinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -114,7 +114,10 @@ static <T> T find(Class<T> factoryClass,
 
         // handling Glassfish/OSGi (platform specific default)
         if (isOsgi()) {
-            return (T) lookupUsingOSGiServiceLoader(factoryId);
+            Object result = lookupUsingOSGiServiceLoader(factoryId);
+            if (result != null) {
+                return (T) result;
+            }
         }
 
         // If not found and fallback should not be tried, return a null result.