[Git][debian-gis-team/josm][master] 2 commits: Add upstream patch to fix NPE.

[Bas Couwenberg]

Bas Couwenberg pushed to branch master at Debian GIS Project / josm


Commits:
958a5212 by Bas Couwenberg at 2018-07-08T16:18:08+02:00
Add upstream patch to fix NPE.

See: https://josm.openstreetmap.de/ticket/16474

- - - - -
c8e735d2 by Bas Couwenberg at 2018-07-08T16:43:15+02:00
Set distribution to unstable.

- - - - -


3 changed files:

- debian/changelog
- debian/patches/series
- + debian/patches/svn-r14000_fix-16462-NPE.patch


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-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 at debian.org>  Thu, 05 Jul 2018 10:14:58 +0200
+ -- Bas Couwenberg <sebastic at debian.org>  Sun, 08 Jul 2018 16:43:06 +0200
 
 josm (0.0.svn13996+dfsg-2) unstable; urgency=medium
 


=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/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
=====================================
--- /dev/null
+++ b/debian/patches/svn-r14000_fix-16462-NPE.patch
@@ -0,0 +1,17 @@
+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<>();



View it on GitLab: https://salsa.debian.org/debian-gis-team/josm/compare/ff08e00d2b3f2a8ce5550dff530e67e19a8b12e8...c8e735d2767ac57c28bbc4bdd5d8c9593a0205f2

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/josm/compare/ff08e00d2b3f2a8ce5550dff530e67e19a8b12e8...c8e735d2767ac57c28bbc4bdd5d8c9593a0205f2
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20180708/fcd4961e/attachment-0001.html>