Merge pull request #35 from luiseufrasio/FISH-9551-avoiding-npe-p5

FISH-9551 : avoiding NPE in Linux
payara · Sep 23, 2024 · 40550ae · 40550ae
2 parents 5714742 + 635afe8
commit 40550ae
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/moxy/org.eclipse.persistence.moxy/src/org/eclipse/persistence/jaxb/ValidationXMLReader.java b/moxy/org.eclipse.persistence.moxy/src/org/eclipse/persistence/jaxb/ValidationXMLReader.java
@@ -94,7 +94,8 @@ public Map<Class<?>, Boolean> call() throws Exception {
      * Checks if validation.xml exists.
      */
     public static boolean isValidationXmlPresent() {
-        return getThreadContextClassLoader().getResource(VALIDATION_XML) != null;
+        ClassLoader threadContextClassLoader = getThreadContextClassLoader();
+        return threadContextClassLoader != null && threadContextClassLoader.getResource(VALIDATION_XML) != null;
     }
 
     private void parseConstraintFiles() {
@@ -170,7 +171,14 @@ private void parseValidationXML(String constraintsFilePath, DefaultHandler handl
 
     private static ClassLoader getThreadContextClassLoader() {
         return PrivilegedAccessHelper.callDoPrivileged(
-                () -> Thread.currentThread().getContextClassLoader()
+                () ->  {
+                    ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+                    if (classLoader == null) {
+                        Thread.currentThread().setContextClassLoader(ClassLoader.getSystemClassLoader());
+                        classLoader = Thread.currentThread().getContextClassLoader();
+                    }
+                    return classLoader;
+                }
         );
     }