From 211c4dbd79d92dcc56f186d0dd8b50849f9236ff Mon Sep 17 00:00:00 2001
From: CodeInTheory <codeintheory@yahoo.com>
Date: Wed, 5 Jul 2017 17:30:04 -0700
Subject: [PATCH] Prevent NullPointerException by not setting the static
 instance until registration is complete (#2061)

---
 library/src/main/java/com/bumptech/glide/Glide.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/library/src/main/java/com/bumptech/glide/Glide.java b/library/src/main/java/com/bumptech/glide/Glide.java
index ae86c11e7..c52ea23b4 100644
--- a/library/src/main/java/com/bumptech/glide/Glide.java
+++ b/library/src/main/java/com/bumptech/glide/Glide.java
@@ -167,10 +167,11 @@ public class Glide {
                     for (GlideModule module : modules) {
                         module.applyOptions(applicationContext, builder);
                     }
-                    glide = builder.createGlide();
+                    Glide glide = builder.createGlide();
                     for (GlideModule module : modules) {
                         module.registerComponents(applicationContext, glide);
                     }
+                    Glide.glide = glide;
                 }
             }
         }
-- 
GitLab