[tomcat8] 09/10: Fixed the test failure in TestNamingContext

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch jessie
in repository tomcat8.

commit 14e45f5f7a008e9dacf0f1270c5356fcc0ee1e2d
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Nov 23 19:28:03 2016 +0100

    Fixed the test failure in TestNamingContext
---
 debian/changelog                   | 2 ++
 debian/patches/CVE-2016-6797.patch | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 0b8c011..95a7a32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,8 @@ tomcat8 (8.0.14-1+deb8u5) UNRELEASED; urgency=medium
   * Set the locale when running the tests to prevent locale sensitive tests
     from failing
   * Added asm-all.jar to the test classpath to fix TestWebappServiceLoader
+  * Fixed a test failure in the new TestNamingContext test added with the fix
+    for CVE-2016-6797
 
  -- Emmanuel Bourg <ebourg at apache.org>  Tue, 22 Nov 2016 23:21:56 +0100
 
diff --git a/debian/patches/CVE-2016-6797.patch b/debian/patches/CVE-2016-6797.patch
index ac6a2ec..525276f 100644
--- a/debian/patches/CVE-2016-6797.patch
+++ b/debian/patches/CVE-2016-6797.patch
@@ -181,7 +181,7 @@ Origin: backport, https://svn.apache.org/r1757273
 +        Tomcat tomcat = getTomcatInstance();
 +        tomcat.enableNaming();
 +
-+        org.apache.catalina.Context ctx = tomcat.addContext("", null);
++        org.apache.catalina.Context ctx = tomcat.addContext("", System.getProperty("java.io.tmpdir"));
 +
 +        tomcat.start();
 +

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