[jmapviewer] 01/05: Add upstream patch to handle empty cookies.

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository jmapviewer.

commit fd96b1fb489ac3e48cd45a15ba8450f0ec427486
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Jul 1 11:17:56 2017 +0200

    Add upstream patch to handle empty cookies.
---
 debian/changelog                                     |  6 ++++++
 debian/patches/series                                |  1 +
 debian/patches/svn-r33422_handle-empty-cookies.patch | 18 ++++++++++++++++++
 3 files changed, 25 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5428a4c..4852188 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+jmapviewer (2.2+dfsg-2) UNRELEASED; urgency=medium
+
+  * Add upstream patch to handle empty cookies.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sat, 01 Jul 2017 11:17:45 +0200
+
 jmapviewer (2.2+dfsg-1) unstable; urgency=medium
 
   * Move from experimental to unstable.
diff --git a/debian/patches/series b/debian/patches/series
index 32e8c24..b406cce 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01-build_less.patch
 03-use-installed-library-in-demo.patch
+svn-r33422_handle-empty-cookies.patch
diff --git a/debian/patches/svn-r33422_handle-empty-cookies.patch b/debian/patches/svn-r33422_handle-empty-cookies.patch
new file mode 100644
index 0000000..bb189a3
--- /dev/null
+++ b/debian/patches/svn-r33422_handle-empty-cookies.patch
@@ -0,0 +1,18 @@
+Description: handle empty cookies
+Author: donvip
+Origin: https://trac.openstreetmap.org/changeset/33422/subversion
+
+--- a/src/org/openstreetmap/gui/jmapviewer/tilesources/TemplatedTMSTileSource.java
++++ b/src/org/openstreetmap/gui/jmapviewer/tilesources/TemplatedTMSTileSource.java
+@@ -55,8 +55,9 @@ public class TemplatedTMSTileSource exte
+      */
+     public TemplatedTMSTileSource(TileSourceInfo info) {
+         super(info);
+-        if (info.getCookies() != null) {
+-            headers.put(COOKIE_HEADER, info.getCookies());
++        String cookies = info.getCookies();
++        if (cookies != null && !cookies.isEmpty()) {
++            headers.put(COOKIE_HEADER, cookies);
+         }
+         handleTemplate();
+     }

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