# FIxed NPE in IgniteUtils.resolveIgniteUrl() (2).
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/62370939 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/62370939 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/62370939 Branch: refs/heads/ignite-394 Commit: 623709395072a61a3ed4164e1895a845c52dff02 Parents: e986b62 Author: vozerov-gridgain <voze...@gridgain.com> Authored: Fri Mar 6 15:13:15 2015 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Fri Mar 6 15:13:15 2015 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/internal/util/IgniteUtils.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/62370939/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java index 7f366aa..24d2f8a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java @@ -3208,11 +3208,15 @@ public abstract class IgniteUtils { } } - String locPath = (metaInf ? "META-INF/" : "") + path.replaceAll("\\\\", "/"); - ClassLoader clsLdr = Thread.currentThread().getContextClassLoader(); - return clsLdr != null ? clsLdr.getResource(locPath) : null; + if (clsLdr != null) { + String locPath = (metaInf ? "META-INF/" : "") + path.replaceAll("\\\\", "/"); + + return clsLdr.getResource(locPath); + } + else + return null; } /**
