init fix

apache · Oct 22, 2023 · 8d82c96 · 8d82c96
1 parent c5d19d0
commit 8d82c96
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/src/main/java/org/apache/commons/crypto/random/CryptoRandomFactory.java b/src/main/java/org/apache/commons/crypto/random/CryptoRandomFactory.java
@@ -198,6 +198,14 @@ public static CryptoRandom getCryptoRandom(final Properties props)
             } catch (final Exception e) {
                 lastException = e;
                 errorMessage.append("CryptoRandom: [" + className + "] failed with " + e.getMessage());
+            } catch (final ExceptionInInitializerError initializerError) {
+                Throwable t = initializerError.getException();
+                if (t isinstanceof Exception) {
+                    lastException = (Exception) t;
+                    errorMessage.append("CryptoRandom: [" + className + "] initialization failed with " + t.getMessage());
+                } else {
+                    throw initializerError;
+                }
             }
         }