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

junichi11 · web-flow · commit 22172a9df0db · 2024-12-19T07:43:04.000+09:00
Prevent NPE
diff --git a/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/navigation/JsonOccurrencesFinder.java b/webcommon/javascript2.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/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/navigation/OccurrencesFinderImpl.java b/webcommon/javascript2.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

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,9 @@ public void setCaretPosition(int position) {`
`59`	`59`
`60`	`60`	`@Override`
`61`	`61`	`public Map<OffsetRange, ColoringAttributes> getOccurrences() {`
`62`		`- return range2Attribs;`
	`62`	`+ return range2Attribs != null`
	`63`	`+ ? Collections.unmodifiableMap(range2Attribs)`
	`64`	`+ : Collections.emptyMap();`
`63`	`65`	`}`
`64`	`66`
`65`	`67`	`@Override`