Merge pull request mvel#75 from objectiser/classloader

Fix NPE when using mvel compiled expression from bootstrap classloader
karibe · Jul 28, 2015 · dbab7f0 · dbab7f0
2 parents 053b19d + 3b1427a
commit dbab7f0
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/main/java/org/mvel2/optimizers/OptimizerFactory.java b/src/main/java/org/mvel2/optimizers/OptimizerFactory.java
@@ -42,7 +42,11 @@ public class OptimizerFactory {
      * By default, activate the JIT if ASM is present in the classpath
      */
     try {
-      OptimizerFactory.class.getClassLoader().loadClass("org.mvel2.asm.ClassWriter");
+      if (OptimizerFactory.class.getClassLoader() != null) {
+          OptimizerFactory.class.getClassLoader().loadClass("org.mvel2.asm.ClassWriter");
+      } else {
+          ClassLoader.getSystemClassLoader().loadClass("org.mvel2.asm.ClassWriter");
+      }
       accessorCompilers.put("ASM", new ASMAccessorOptimizer());
     }
     catch (ClassNotFoundException e) {