Changeset 12498 in josm for trunk

Timestamp:

2017-07-23T15:55:06+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #15056 - NPE

File:

• trunk/src/org/openstreetmap/josm/gui/download/BookmarkList.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/download/BookmarkList.java

@@ -278 +278 @@
         final int n = MAX_CHANGESET_BOOKMARKS.get();
         if (n > 0 && !im.isAnonymous()) {
-            final ChangesetCacheManager ccm = ChangesetCacheManager.getInstance();
-            final int userId = im.getUserInfo().getId();
-            int found = 0;
-            for (int i = 0; i < ccm.getModel().getRowCount() && found < n; i++) {
-                Changeset cs = ccm.getModel().getValueAt(i, 0);
-                if (cs.getUser().getId() == userId && cs.getBounds() != null) {
-                    model.addElement(new ChangesetBookmark(cs));
-                    found++;
+            final UserInfo userInfo = im.getUserInfo();
+            if (userInfo != null) {
+                final ChangesetCacheManager ccm = ChangesetCacheManager.getInstance();
+                final int userId = userInfo.getId();
+                int found = 0;
+                for (int i = 0; i < ccm.getModel().getRowCount() && found < n; i++) {
+                    Changeset cs = ccm.getModel().getValueAt(i, 0);
+                    if (cs.getUser().getId() == userId && cs.getBounds() != null) {
+                        model.addElement(new ChangesetBookmark(cs));
+                        found++;
+                    }
                 }
             }