commit 92c0a7289924f209332af675311c044338347b62
author Evgeny Tugarev <etugarev@gmail.com> Fri Nov 22 23:42:12 2019 +0100
committer Evgeny Tugarev <etugarev@gmail.com> Fri Nov 22 23:42:12 2019 +0100
tree 5454e2be9bd684eb508b3341cc61e6cc81de6060
parent 3b56a556568409c942717eb7d32e63270ebdc19d

Added NPE check

src/main/java/org/apache/sling/models/impl/ModelAdapterFactory.java

diff --git a/src/main/java/org/apache/sling/models/impl/ModelAdapterFactory.java b/src/main/java/org/apache/sling/models/impl/ModelAdapterFactory.java
index d06787e..5425832 100644
--- a/src/main/java/org/apache/sling/models/impl/ModelAdapterFactory.java
+++ b/src/main/java/org/apache/sling/models/impl/ModelAdapterFactory.java
@@ -369,10 +369,12 @@
             if (modelAnnotation.cache()) {
                 Map<Class<?>, SoftReference<Object>> adaptableCache = adapterCache.get(adaptable);
                 if (adaptableCache != null) {
-                    SoftReference<Object> SoftReference = adaptableCache.get(requestedType);
-                    ModelType cachedObject = (ModelType) SoftReference.get();
-                    if (cachedObject != null) {
-                        return new Result<>(cachedObject);
+                    SoftReference<Object> softReference = adaptableCache.get(requestedType);
+                    if (softReference != null) {
+                        ModelType cachedObject = (ModelType) softReference.get();
+                        if (cachedObject != null) {
+                            return new Result<>(cachedObject);
+                        }
                     }
                 }
             }