Merge pull request #8071 from junichi11/js-fix-npe

Prevent NPE
apache · Dec 18, 2024 · 22172a9 · 22172a9
2 parents 70f6941 + 2a5566f
commit 22172a9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/....editor/src/org/netbeans/modules/javascript2/editor/navigation/JsonOccurrencesFinder.java b/....editor/src/org/netbeans/modules/javascript2/editor/navigation/JsonOccurrencesFinder.java
@@ -59,7 +59,9 @@ public void setCaretPosition(int position) {
 
     @Override
     public Map<OffsetRange, ColoringAttributes> getOccurrences() {
-        return range2Attribs;
+        return range2Attribs != null
+                ? Collections.unmodifiableMap(range2Attribs)
+                : Collections.emptyMap();
     }
 
     @Override

diff --git a/....editor/src/org/netbeans/modules/javascript2/editor/navigation/OccurrencesFinderImpl.java b/....editor/src/org/netbeans/modules/javascript2/editor/navigation/OccurrencesFinderImpl.java
@@ -59,7 +59,9 @@ public void setCaretPosition(int position) {
 
     @Override
     public Map<OffsetRange, ColoringAttributes> getOccurrences() {
-        return range2Attribs;
+        return range2Attribs != null
+                ? Collections.unmodifiableMap(range2Attribs)
+                : Collections.emptyMap();
     }
 
     @Override