[jmapviewer] 04/05: Drop fix-NPE-when-no-content-is-defined.patch, included upstream.

[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 082866793450a127c5e130426a291068065877e5
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon May 30 23:22:27 2016 +0200

    Drop fix-NPE-when-no-content-is-defined.patch, included upstream.
---
 debian/patches/fix-NPE-when-no-content-is-defined.patch | 16 ----------------
 debian/patches/series                                   |  1 -
 2 files changed, 17 deletions(-)

diff --git a/debian/patches/fix-NPE-when-no-content-is-defined.patch b/debian/patches/fix-NPE-when-no-content-is-defined.patch
deleted file mode 100644
index 8da7017..0000000
--- a/debian/patches/fix-NPE-when-no-content-is-defined.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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 26a7303..32e8c24 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 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