[jmapviewer] 04/06: Drop svn-r33422_handle-empty-cookies.patch, included upstream.

[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 6036b38a528c8c66ed9e6395f03abdd20b2e647c
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Jul 29 10:24:50 2017 +0200

    Drop svn-r33422_handle-empty-cookies.patch, included upstream.
---
 debian/changelog                                     |  1 +
 debian/patches/series                                |  1 -
 debian/patches/svn-r33422_handle-empty-cookies.patch | 18 ------------------
 3 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e5877e6..0836d88 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 jmapviewer (2.3+dfsg-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Drop svn-r33422_handle-empty-cookies.patch, included upstream.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sat, 29 Jul 2017 10:21:46 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index b406cce..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
-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
deleted file mode 100644
index bb189a3..0000000
--- a/debian/patches/svn-r33422_handle-empty-cookies.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-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