From 58c09b6217c546e1a251a82da227018f05277228 Mon Sep 17 00:00:00 2001
From: Mark Thomas <markt@apache.org>
Date: Fri, 27 Nov 2015 12:18:47 +0000
Subject: [PATCH] Fix the issue that meant the work-around for BZ 58660 would
 not work.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1716860 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/catalina/connector/MapperListener.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/connector/MapperListener.java b/java/org/apache/catalina/connector/MapperListener.java
index b7dffe97cfba..2bf89deb3831 100644
--- a/java/org/apache/catalina/connector/MapperListener.java
+++ b/java/org/apache/catalina/connector/MapperListener.java
@@ -384,7 +384,8 @@ private void registerContext(Context context) {
 
         mapper.addContextVersion(host.getName(), host, contextPath,
                 context.getWebappVersion(), context, welcomeFiles, resources,
-                wrappers);
+                wrappers, context.getMapperContextRootRedirectEnabled(),
+                context.getMapperDirectoryRedirectEnabled());
 
         if(log.isDebugEnabled()) {
             log.debug(sm.getString("mapperListener.registerContext",