From b128baee4af6a1f17647174e74f530ee8d0dea15 Mon Sep 17 00:00:00 2001 From: kkolinko Date: Tue, 16 Feb 2010 04:52:38 +0000 Subject: [PATCH] Additional test for BZ 48616 git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@910395 13f79535-47bb-0310-9956-ffa450edef68 --- .../jasper/compiler/TestScriptingVariabler.java | 20 ++++++++++++++++ test/webapp/bug48616b.jsp | 28 ++++++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 test/webapp/bug48616b.jsp diff --git a/test/org/apache/jasper/compiler/TestScriptingVariabler.java b/test/org/apache/jasper/compiler/TestScriptingVariabler.java index fcce86834..87e796031 100644 --- a/test/org/apache/jasper/compiler/TestScriptingVariabler.java +++ b/test/org/apache/jasper/compiler/TestScriptingVariabler.java @@ -93,4 +93,24 @@ public class TestScriptingVariabler extends TomcatBaseTest { assertNull(e); } + public void testBug48616b() throws Exception { + Tomcat tomcat = getTomcatInstance(); + + File appDir = + new File("test/webapp"); + // app dir is relative to server home + tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); + + tomcat.start(); + + Exception e = null; + try { + getUrl("http://localhost:" + getPort() + "/test/bug48616b.jsp"); + } catch (IOException ioe) { + e = ioe; + } + + // Should not fail + assertNull(e); + } } diff --git a/test/webapp/bug48616b.jsp b/test/webapp/bug48616b.jsp new file mode 100644 index 000000000..31476ce6b --- /dev/null +++ b/test/webapp/bug48616b.jsp @@ -0,0 +1,28 @@ +<%-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--%> +<%@ taglib prefix="bugs" uri="http://tomcat.apache.org/bugs" %> +<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %> +<%-- + Tries to place the classic tag that defines a variable + into a simple tag +--%> + + + + + + -- 2.11.0