Changeset 12552 in josm for trunk/src/org/openstreetmap/josm/gui/help

Timestamp:

2017-08-01T19:38:13+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #15099 - fix NPE in help browser

File:

• trunk/src/org/openstreetmap/josm/gui/help/HelpBrowserHistory.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/help/HelpBrowserHistory.java

@@ -80 +80 @@
      */
     public void setCurrentUrl(String url) {
-        boolean add = true;
+        if (url != null) {
+            boolean add = true;
 
-        if (historyPos >= 0 && historyPos < history.size() && history.get(historyPos).equals(url)) {
-            add = false;
-        } else if (historyPos == history.size() -1) {
-            // do nothing just append
-        } else if (historyPos == 0 && !history.isEmpty()) {
-            history = new ArrayList<>(Collections.singletonList(history.get(0)));
-        } else if (historyPos < history.size() -1 && historyPos > 0) {
-            history = new ArrayList<>(history.subList(0, historyPos));
-        } else {
-            history = new ArrayList<>();
+            if (historyPos >= 0 && historyPos < history.size() && history.get(historyPos).equals(url)) {
+                add = false;
+            } else if (historyPos == history.size() -1) {
+                // do nothing just append
+            } else if (historyPos == 0 && !history.isEmpty()) {
+                history = new ArrayList<>(Collections.singletonList(history.get(0)));
+            } else if (historyPos < history.size() -1 && historyPos > 0) {
+                history = new ArrayList<>(history.subList(0, historyPos));
+            } else {
+                history = new ArrayList<>();
+            }
+            if (add) {
+                history.add(url);
+                historyPos = history.size()-1;
+            }
+            fireStateChanged();
         }
-        if (add) {
-            history.add(url);
-            historyPos = history.size()-1;
-        }
-        fireStateChanged();
     }
 }