debian/changelog

-josm (0.0.svn13996+dfsg-3) UNRELEASED; urgency=medium
+josm (0.0.svn13996+dfsg-3) unstable; urgency=medium
 
   * Bump Standards-Version to 4.1.5, no changes.
+  * Add upstream patch to fix NPE.
+    See: https://josm.openstreetmap.de/ticket/16474
 
- -- Bas Couwenberg <sebastic@debian.org>  Thu, 05 Jul 2018 10:14:58 +0200
+ -- Bas Couwenberg <sebastic@debian.org>  Sun, 08 Jul 2018 16:43:06 +0200
 
 josm (0.0.svn13996+dfsg-2) unstable; urgency=medium
 

debian/patches/series

@@ -7,3 +7,4 @@
 07-use_system_fonts.patch
 08-use_noto_font.patch
 09-no-java-8.patch
+svn-r14000_fix-16462-NPE.patch

debian/patches/svn-r14000_fix-16462-NPE.patch

+Description: fix #16462 - NPE
+Author: Don-vip
+Origin: https://josm.openstreetmap.de/changeset/14000/josm
+Bug: https://josm.openstreetmap.de/ticket/16462
+     https://josm.openstreetmap.de/ticket/16474
+
+--- a/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/MultipolygonCache.java
++++ b/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/MultipolygonCache.java
+@@ -80,7 +80,7 @@ public final class MultipolygonCache imp
+      */
+     public Multipolygon get(Relation r, boolean forceRefresh) {
+         Multipolygon multipolygon = null;
+-        if (r != null) {
++        if (r != null && r.getDataSet() != null) {
+             Map<Relation, Multipolygon> map2 = cache.get(r.getDataSet());
+             if (map2 == null) {
+                 map2 = new ConcurrentHashMap<>();