Updated Branches: refs/heads/trunk d47d4b799 -> 1795e1b1c
r/m package exclusion list Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1795e1b1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1795e1b1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1795e1b1 Branch: refs/heads/trunk Commit: 1795e1b1cdef53d12e30ff24d7f934a1f0b4a814 Parents: d47d4b7 Author: Jonathan Ellis <jbel...@apache.org> Authored: Mon Jul 29 22:22:52 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Mon Jul 29 22:24:22 2013 -0500 ---------------------------------------------------------------------- .../apache/cassandra/triggers/CustomClassLoader.java | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1795e1b1/src/java/org/apache/cassandra/triggers/CustomClassLoader.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/triggers/CustomClassLoader.java b/src/java/org/apache/cassandra/triggers/CustomClassLoader.java index aba0bb9..1f54195 100644 --- a/src/java/org/apache/cassandra/triggers/CustomClassLoader.java +++ b/src/java/org/apache/cassandra/triggers/CustomClassLoader.java @@ -45,7 +45,6 @@ import com.google.common.io.Files; public class CustomClassLoader extends URLClassLoader { private static final Logger logger = LoggerFactory.getLogger(CustomClassLoader.class); - private static final String[] PACKAGE_EXCLUSION_LIST = new String[] {"org.apache.log4j", "org.slf4j"}; private final Map<String, Class<?>> cache = new ConcurrentHashMap<String, Class<?>>(); private final ClassLoader parent; @@ -109,8 +108,7 @@ public class CustomClassLoader extends URLClassLoader { try { - if (!isExcluded(name)) - return parent.loadClass(name); + return parent.loadClass(name); } catch (ClassNotFoundException ex) { @@ -121,14 +119,4 @@ public class CustomClassLoader extends URLClassLoader cache.put(name, clazz); return clazz; } - - private boolean isExcluded(String name) - { - for (String exclusion : PACKAGE_EXCLUSION_LIST) - { - if (name.startsWith(exclusion)) - return true; - } - return false; - } }
