Cleanup and fixes.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5fa1e606 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5fa1e606 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5fa1e606 Branch: refs/heads/ignite-3909 Commit: 5fa1e6068f662308394c9236a354306a6b256072 Parents: 8e5dcd2 Author: vozerov-gridgain <voze...@gridgain.com> Authored: Thu Sep 15 18:42:25 2016 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Thu Sep 15 18:42:25 2016 +0300 ---------------------------------------------------------------------- .../internal/processors/hadoop/HadoopClassLoader.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/5fa1e606/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopClassLoader.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopClassLoader.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopClassLoader.java index a921f03..c0b671e 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopClassLoader.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopClassLoader.java @@ -434,11 +434,17 @@ public class HadoopClassLoader extends URLClassLoader implements ClassCache { // 3. Special handling for "org.apache" if (cls.startsWith("org.apache.")) { - if (cls.startsWith("org.apache.ignite")) - return cls.contains(".hadoop.") || cls.contains(".igfs.") || cls.contains(".fs."); + if (cls.startsWith("org.apache.ignite")) { + if (!cls.contains(".hadoop.") && !cls.contains(".igfs.") && !cls.contains(".fs.")) + return false; + } if (cls.startsWith("org.apache.hadoop")) return true; + + if (cls.startsWith("org.apache.xerces") || cls.startsWith("org.apache.log4j") || cls.startsWith("org.apache.commons.logging") || cls.startsWith("org.apache.commons.lang") || cls.startsWith("org.apache.commons.collections") + || cls.startsWith("org.apache.commons.configuration")) + return false; } // No more guesses, will parse the class.
