Do not assume services can always be loaded from a ModuleLayer

kordamp · Nov 9, 2020 · c872815 · c872815
1 parent 6187014
commit c872815
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/core/ikonli-javafx/src/main/java/org/kordamp/ikonli/javafx/IkonResolver.java b/core/ikonli-javafx/src/main/java/org/kordamp/ikonli/javafx/IkonResolver.java
@@ -32,7 +32,7 @@ public class IkonResolver extends AbstractIkonResolver {
     static {
         INSTANCE = new IkonResolver();
 
-        ServiceLoader<IkonHandler> loader = ServiceLoader.load(IkonHandler.class.getModule().getLayer(), IkonHandler.class);
+        ServiceLoader<IkonHandler> loader = resolveServiceLoader();
         for (IkonHandler handler : loader) {
             HANDLERS.add(handler);
             handler.setFont(Font.loadFont(handler.getFontResource().toExternalForm(), 16));
@@ -43,6 +43,13 @@ private IkonResolver() {
 
     }
 
+    private static ServiceLoader<IkonHandler> resolveServiceLoader() {
+        if (null != IkonHandler.class.getModule().getLayer()) {
+            return ServiceLoader.load(IkonHandler.class.getModule().getLayer(), IkonHandler.class);
+        }
+        return ServiceLoader.load(IkonHandler.class);
+    }
+
     public static IkonResolver getInstance() {
         return INSTANCE;
     }

diff --git a/core/ikonli-swing/src/main/java/org/kordamp/ikonli/swing/IkonResolver.java b/core/ikonli-swing/src/main/java/org/kordamp/ikonli/swing/IkonResolver.java
@@ -34,7 +34,7 @@ public class IkonResolver extends AbstractIkonResolver {
     static {
         INSTANCE = new IkonResolver();
 
-        ServiceLoader<IkonHandler> loader = ServiceLoader.load(IkonHandler.class.getModule().getLayer(), IkonHandler.class);
+        ServiceLoader<IkonHandler> loader = resolveServiceLoader();
         for (IkonHandler handler : loader) {
             HANDLERS.add(handler);
 
@@ -54,6 +54,13 @@ private IkonResolver() {
 
     }
 
+    private static ServiceLoader<IkonHandler> resolveServiceLoader() {
+        if (null != IkonHandler.class.getModule().getLayer()) {
+            return ServiceLoader.load(IkonHandler.class.getModule().getLayer(), IkonHandler.class);
+        }
+        return ServiceLoader.load(IkonHandler.class);
+    }
+
     public static IkonResolver getInstance() {
         return INSTANCE;
     }