[netbeans-html4j] 02/02: Avoid NPE as ref can be null for null presenters

[jt...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jtulach pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-html4j.git

commit 1ce523aa194335b6b416b1aae075942a42c39c37
Author: Jaroslav Tulach <ja...@apidesign.org>
AuthorDate: Sat May 4 19:37:07 2019 +0200

    Avoid NPE as ref can be null for null presenters
---
 ko4j/src/main/java/org/netbeans/html/ko4j/CacheObjs.java   | 2 +-
 ko4j/src/test/java/org/netbeans/html/ko4j/MapObjsTest.java | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ko4j/src/main/java/org/netbeans/html/ko4j/CacheObjs.java b/ko4j/src/main/java/org/netbeans/html/ko4j/CacheObjs.java
index e1aea1a..3a1e63f 100644
--- a/ko4j/src/main/java/org/netbeans/html/ko4j/CacheObjs.java
+++ b/ko4j/src/main/java/org/netbeans/html/ko4j/CacheObjs.java
@@ -36,7 +36,7 @@ final class CacheObjs {
     }
 
     Fn.Presenter get() {
-        return ref.presenter();
+        return ref == null ? null : ref.presenter();
     }
 
     static synchronized CacheObjs find(Fn.Presenter key) {
diff --git a/ko4j/src/test/java/org/netbeans/html/ko4j/MapObjsTest.java b/ko4j/src/test/java/org/netbeans/html/ko4j/MapObjsTest.java
index 1f397d8..f2f8c71 100644
--- a/ko4j/src/test/java/org/netbeans/html/ko4j/MapObjsTest.java
+++ b/ko4j/src/test/java/org/netbeans/html/ko4j/MapObjsTest.java
@@ -62,6 +62,13 @@ public class MapObjsTest {
         assertEquals(v2.get(p2), null);
     }
 
+    @Test
+    public void cacheForNull() {
+        CacheObjs c1 = CacheObjs.find(null);
+        CacheObjs c2 = CacheObjs.find(null);
+        assertSame(c1, c2);
+    }
+
     private static final class Value {
         private Object now;
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists