Optimized Null value lazy

Signed-off-by: Tony Tkacik <tonydamage@gmail.com>
Evolveum · Jan 27, 2021 · 62865c3 · 62865c3
1 parent 16c24bc
commit 62865c3
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/infra/axiom/src/main/java/com/evolveum/axiom/concepts/Lazy.java b/infra/axiom/src/main/java/com/evolveum/axiom/concepts/Lazy.java
@@ -8,7 +8,7 @@
 
 public class Lazy<T> extends AbstractLazy<T> implements java.util.function.Supplier<T> {
 
-    private static final Lazy NULL = Lazy.instant(null);
+    private static final Lazy<?> NULL = new Lazy<>(null);
 
     private Lazy(Object supplier) {
         super(supplier);
@@ -19,12 +19,15 @@ public static final <T> Lazy<T> from(Supplier<? extends T> supplier) {
     }
 
     public static <T> Lazy<T> instant(T value) {
-        return new Lazy<T>(value);
+        if(value == null) {
+            return nullValue();
+        }
+        return new Lazy<>(value);
     }
 
     @SuppressWarnings("unchecked")
     public static <T> Lazy<T> nullValue() {
-        return NULL;
+        return Lazy.class.cast(NULL);
     }
 
     @Override