# FIxed NPE in IgniteUtils.resolveIgniteUrl().
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e986b62f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e986b62f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e986b62f Branch: refs/heads/ignite-51 Commit: e986b62f2e5a29210fcf9f4b57e5fddc9559bfd8 Parents: 13bd631 Author: vozerov-gridgain <voze...@gridgain.com> Authored: Fri Mar 6 15:12:07 2015 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Fri Mar 6 15:12:07 2015 +0300 ---------------------------------------------------------------------- .../main/java/org/apache/ignite/internal/util/IgniteUtils.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e986b62f/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 79b2171..7f366aa 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 @@ -3210,7 +3210,9 @@ public abstract class IgniteUtils { String locPath = (metaInf ? "META-INF/" : "") + path.replaceAll("\\\\", "/"); - return Thread.currentThread().getContextClassLoader().getResource(locPath); + ClassLoader clsLdr = Thread.currentThread().getContextClassLoader(); + + return clsLdr != null ? clsLdr.getResource(locPath) : null; } /**
