Remove class loader detection from DynamicClassLoader

soscpd · Sep 4, 2016 · e14b747 · e14b747
1 parent 6219962
commit e14b747
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 22 deletions.
diff --git a/presto-bytecode/src/main/java/com/facebook/presto/bytecode/DynamicClassLoader.java b/presto-bytecode/src/main/java/com/facebook/presto/bytecode/DynamicClassLoader.java
@@ -31,19 +31,14 @@ public class DynamicClassLoader
     private final ConcurrentMap<String, byte[]> pendingClasses = new ConcurrentHashMap<>();
     private final Map<Long, MethodHandle> callSiteBindings;
 
-    public DynamicClassLoader()
-    {
-        this(null);
-    }
-
     public DynamicClassLoader(ClassLoader parentClassLoader)
     {
-        this(parentClassLoader, ImmutableMap.<Long, MethodHandle>of());
+        this(parentClassLoader, ImmutableMap.of());
     }
 
     public DynamicClassLoader(ClassLoader parentClassLoader, Map<Long, MethodHandle> callSiteBindings)
     {
-        super(resolveClassLoader(parentClassLoader));
+        super(parentClassLoader);
         this.callSiteBindings = ImmutableMap.copyOf(callSiteBindings);
     }
 
@@ -126,18 +121,4 @@ private Class<?> resolveClass(Class<?> clazz, boolean resolve)
         }
         return clazz;
     }
-
-    private static ClassLoader resolveClassLoader(ClassLoader parentClassLoader)
-    {
-        if (parentClassLoader == null) {
-            parentClassLoader = Thread.currentThread().getContextClassLoader();
-        }
-        if (parentClassLoader == null) {
-            parentClassLoader = DynamicClassLoader.class.getClassLoader();
-        }
-        if (parentClassLoader == null) {
-            parentClassLoader = ClassLoader.getSystemClassLoader();
-        }
-        return parentClassLoader;
-    }
 }
diff --git a/...e/src/test/java/com/facebook/presto/bytecode/expression/BytecodeExpressionAssertions.java b/...e/src/test/java/com/facebook/presto/bytecode/expression/BytecodeExpressionAssertions.java
@@ -116,7 +116,7 @@ public static Object execute(Function<Scope, BytecodeNode> nodeGenerator, Parame
             dumpBytecode.visitClass(classDefinition);
         }
 
-        DynamicClassLoader classLoader = parentClassLoader.isPresent() ? new DynamicClassLoader(parentClassLoader.get()) : new DynamicClassLoader();
+        DynamicClassLoader classLoader = new DynamicClassLoader(parentClassLoader.orElse(BytecodeExpressionAssertions.class.getClassLoader()));
         ClassWriter cw = new SmartClassWriter(ClassInfoLoader.createClassInfoLoader(ImmutableList.of(classDefinition), classLoader));
         classDefinition.visit(cw);