Merge branch 'master' into rpau-asm

rpau · Apr 17, 2018 · 49c6e2a · 49c6e2a
2 parents bb63928 + d7da813
commit 49c6e2a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/main/java/org/walkmod/javalang/compiler/types/IndexedURLClassLoader.java b/src/main/java/org/walkmod/javalang/compiler/types/IndexedURLClassLoader.java
@@ -84,6 +84,7 @@ protected Class<?> findClass(String name) throws ClassNotFoundException {
                     }
                 }
                 byte[] data = IOUtil.readStream(res.openStream(), true);
+
                 // Add a CodeSource via a ProtectionDomain, as code may use this to find its own jars.
                 CodeSource cs = new CodeSource(res, (Certificate[])null);
                 PermissionCollection pc = new Permissions();

diff --git a/src/main/java/org/walkmod/javalang/compiler/types/TypesLoaderVisitor.java b/src/main/java/org/walkmod/javalang/compiler/types/TypesLoaderVisitor.java
@@ -17,6 +17,7 @@
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 
+import java.lang.reflect.Modifier;
 import java.net.URLClassLoader;
 import java.util.Iterator;
 import java.util.LinkedList;
@@ -105,7 +106,7 @@ private void loadLangPackage() {
             }
         }
     }
-
+  
     private void addTypes(List<String> files, List<SymbolAction> actions, Node node) {
         for (String classFile: files) {
             if (isClassFile(classFile) && !isAnonymousClass(classFile)) {
@@ -115,7 +116,7 @@ private void addTypes(List<String> files, List<SymbolAction> actions, Node node)
             }
         }
     }
-
+  
     private boolean isClassFile(String classFile) {
         return classFile.endsWith(".class");
     }