Skip to content

Commit 8bfd2f7

Browse files
committed
Fix NPE in ConcurrentLinkedHashMap
1 parent e24c57e commit 8bfd2f7

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

cayenne/src/main/java/org/apache/cayenne/util/concurrentlinkedhashmap/ConcurrentLinkedHashMap.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -788,6 +788,7 @@ else if (onlyIfAbsent) {
788788

789789
@Override
790790
public V remove(Object key) {
791+
if (key == null) return null; // this class does allow null to be used as a key or value (returning here prevents an NPE).
791792
final Node node = data.remove(key);
792793
if (node == null) {
793794
return null;

0 commit comments

Comments
 (0)