phoedos/pmd
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PMDASMClassloader: minor refactoring

Browse Source
This commit is contained in:
Andreas Dangel
2016-07-07 20:47:53 +02:00
parent 9823f17cf8
commit 4d52be5cf2
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pmd-java/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/PMDASMClassLoader.java
View File

@ -6,11 +6,10 @@ package net.sourceforge.pmd.lang.java.typeresolution;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import org.objectweb.asm.ClassReader;
@ -29,6 +28,9 @@ import net.sourceforge.pmd.lang.java.typeresolution.visitors.PMDASMVisitor;
* the negative cases only. The cache is shared between loadClass and getImportedClasses,
* as they are using the same (parent) class loader, e.g. if the class foo.Bar cannot be loaded,
* then the resource foo/Bar.class will not exist, too.
*
* Note: since git show 46ad3a4700b7a233a177fa77d08110127a85604c the cache is using
* a concurrent hash map to avoid synchronizing on the class loader instance.
*/
public final class PMDASMClassLoader extends ClassLoader {
@ -36,7 +38,7 @@ public final class PMDASMClassLoader extends ClassLoader {
private static ClassLoader cachedClassLoader;
/** Caches the names of the classes that we can't load or that don't exist. */
private final ConcurrentHashMap<String, Boolean> m_dontBotherSet = new ConcurrentHashMap<>();
private final ConcurrentMap<String, Boolean> dontBother = new ConcurrentHashMap<>();
static {
registerAsParallelCapable();
@ -62,16 +64,16 @@ public final class PMDASMClassLoader extends ClassLoader {
@Override
public Class<?> loadClass(String name) throws ClassNotFoundException {
if(m_dontBotherSet.containsKey(name))
if(dontBother.containsKey(name))
throw new ClassNotFoundException(name);
try {
return super.loadClass(name);
} catch (ClassNotFoundException e) {
m_dontBotherSet.put(name, Boolean.TRUE);
dontBother.put(name, Boolean.TRUE);
throw e;
} catch (NoClassDefFoundError e) {
m_dontBotherSet.put(name, Boolean.TRUE);
dontBother.put(name, Boolean.TRUE);
// rethrow as ClassNotFoundException, as the remaining part just
// deals with that
// see also: https://sourceforge.net/p/pmd/bugs/1319/
@ -80,7 +82,7 @@ public final class PMDASMClassLoader extends ClassLoader {
}
public synchronized Map<String, String> getImportedClasses(String name) throws ClassNotFoundException {
if (m_dontBotherSet.contains(name)) {
if (dontBother.containsValue(name)) {
throw new ClassNotFoundException(name);
}
try {
@ -102,7 +104,7 @@ public final class PMDASMClassLoader extends ClassLoader {
}
return asmVisitor.getPackages();
} catch (IOException e) {
m_dontBotherSet.put(name, Boolean.TRUE);
dontBother.put(name, Boolean.TRUE);
throw new ClassNotFoundException(name, e);
}
}