[jmapviewer] 01/02: Add upstream patch to fix NPE when no content is defined.

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository jmapviewer.

commit 0b98f095a572ade04f718dadae53ceea4105e19d
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Apr 29 21:15:28 2016 +0200

    Add upstream patch to fix NPE when no content is defined.
---
 debian/changelog                                        |  1 +
 debian/patches/fix-NPE-when-no-content-is-defined.patch | 16 ++++++++++++++++
 debian/patches/series                                   |  1 +
 3 files changed, 18 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 1606126..935ba4e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 jmapviewer (1.15+dfsg-2) UNRELEASED; urgency=medium
 
   * Bump Standards-Version to 3.9.8, no changes.
+  * Add upstream patch to fix NPE when no content is defined.
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 15 Apr 2016 23:59:25 +0200
 
diff --git a/debian/patches/fix-NPE-when-no-content-is-defined.patch b/debian/patches/fix-NPE-when-no-content-is-defined.patch
new file mode 100644
index 0000000..8da7017
--- /dev/null
+++ b/debian/patches/fix-NPE-when-no-content-is-defined.patch
@@ -0,0 +1,16 @@
+Description: Fix NPE when no content is defined.
+Bug: https://josm.openstreetmap.de/ticket/12637
+Author: wiktorn
+Origin: https://trac.openstreetmap.org/changeset/32113/subversion
+
+--- a/src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractTMSTileSource.java
++++ b/src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractTMSTileSource.java
+@@ -185,7 +185,7 @@ public abstract class AbstractTMSTileSou
+                 }
+             }
+         }
+-        if (noTileChecksums != null) {
++        if (noTileChecksums != null && content != null) {
+             for (Entry<String, Set<String>> searchEntry: noTileChecksums.entrySet()) {
+                 MessageDigest md = null;
+                 try {
diff --git a/debian/patches/series b/debian/patches/series
index 32e8c24..26a7303 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01-build_less.patch
 03-use-installed-library-in-demo.patch
+fix-NPE-when-no-content-is-defined.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/jmapviewer.git