#161: NullPointerException in javax.xml.ws.Service.<init>

Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
jakartaee · Feb 19, 2021 · a37443b · a37443b
1 parent 0d4fa9c
commit a37443b
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/api/src/main/java/jakarta/xml/ws/spi/FactoryFinder.java b/api/src/main/java/jakarta/xml/ws/spi/FactoryFinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -71,7 +71,10 @@ static <T> T find(Class<T> factoryClass, String fallbackClassName) {
 
         // handling Glassfish (platform specific default)
         if (isOsgi()) {
-            return (T) lookupUsingOSGiServiceLoader(factoryId);
+            provider = (T) lookupUsingOSGiServiceLoader(factoryId);
+            if (provider != null) {
+                return provider;
+            }
         }
 
         if (fallbackClassName == null) {