From 8fb5858daeee91222272ce48400168d700e1d3eb Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Tue, 16 Aug 2016 19:48:14 +0300
Subject: [PATCH] Fix occasional NPE from reflection initialization

This could happen when a .jar containing Kotlin stdlib and reflection classes
was launched with 'java -jar'
---
 .../src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java b/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java
index 8bc8054c510..f3d0091d8de 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java
+++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java
@@ -91,7 +91,8 @@ public abstract class KotlinBuiltIns {
                 new Function1<String, InputStream>() {
                     @Override
                     public InputStream invoke(String path) {
-                        return KotlinBuiltIns.class.getClassLoader().getResourceAsStream(path);
+                        ClassLoader classLoader = KotlinBuiltIns.class.getClassLoader();
+                        return classLoader != null ? classLoader.getResourceAsStream(path) : ClassLoader.getSystemResourceAsStream(path);
                     }
                 }
         );