throw runtimeex instead of NPE if there is not impl found

Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
jakartaee · Dec 1, 2021 · 8ba9aee · 8ba9aee
1 parent bece214
commit 8ba9aee
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/api/src/main/java/jakarta/activation/FactoryFinder.java b/api/src/main/java/jakarta/activation/FactoryFinder.java
@@ -50,7 +50,7 @@ public RuntimeException createException(Throwable throwable, String message) {
      *                              that there is no default class name
      * @param tryFallback           whether to try the default class as a
      *                              fallback
-     * @exception RuntimeException if there is a SOAP error
+     * @exception RuntimeException if there is no factory found
      */
     static <T> T find(Class<T> factoryClass,
                       String defaultClassName,
@@ -85,9 +85,11 @@ static <T> T find(Class<T> factoryClass,
             }
         }
 
-        // If not found and fallback should not be tried, return a null result.
-        if (!tryFallback)
-            return null;
+        // If not found and fallback should not be tried, throw RuntimeException.
+        if (!tryFallback) {
+            throw new RuntimeException(
+                    "Provider for " + factoryId + " cannot be found", null);
+        }
 
         // We didn't find the class through the usual means so try the default
         // (built in) factory if specified.