Merge pull request #1188 from jbescos/issue1187

ClassLoader issue in embedded Arquillian (additional null check)
jakartaee · Aug 1, 2023 · 82a976e · 82a976e
2 parents 4ea3145 + b623624
commit 82a976e
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/core-profile-tck/tck/src/main/java/ee/jakarta/tck/core/rest/jsonb/cdi/KeysProducer.java b/core-profile-tck/tck/src/main/java/ee/jakarta/tck/core/rest/jsonb/cdi/KeysProducer.java
@@ -29,6 +29,7 @@
 @ApplicationScoped
 public class KeysProducer {
 
+    private static final String PUB_KEY = "/key.pub";
     private PublicKey publicKey;
 
     /**
@@ -40,7 +41,8 @@ private void loadKeys() {
         try {
             ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
             byte[] pubKeyData;
-            try (InputStream keyIS = classLoader.getResourceAsStream("/key.pub")) {
+            try (InputStream keyIS = classLoader != null ?
+                    classLoader.getResourceAsStream(PUB_KEY) : getClass().getResourceAsStream(PUB_KEY)) {
                 if (keyIS == null) {
                     throw new IllegalStateException("Failed to find /key.pub");
                 }