You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2015/02/25 12:27:09 UTC
svn commit: r1662201 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/jasper/
java/org/apache/jasper/compiler/ test/org/apache/jasper/
test/webapp/WEB-INF/ webapps/docs/
Author: markt
Date: Wed Feb 25 11:27:09 2015
New Revision: 1662201
URL: http://svn.apache.org/r1662201
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57626
Ensure that when processing a tag file within a Jar that the JspComppilationContext always has the latest, opened Jar instance to work with.
Add a unit test for recompilation of a modified JSOP that depends on a tag file packaged in a Jar.
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/jasper/JspCompilationContext.java
tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
tomcat/tc8.0.x/trunk/test/org/apache/jasper/TestJspCompilationContext.java
tomcat/tc8.0.x/trunk/test/webapp/WEB-INF/web.xml
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 25 11:27:09 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,1655558,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657
907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,1655558,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657
907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200
Modified: tomcat/tc8.0.x/trunk/java/org/apache/jasper/JspCompilationContext.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/jasper/JspCompilationContext.java?rev=1662201&r1=1662200&r2=1662201&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/jasper/JspCompilationContext.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/jasper/JspCompilationContext.java Wed Feb 25 11:27:09 2015
@@ -89,7 +89,7 @@ public class JspCompilationContext {
private final boolean isTagFile;
private boolean protoTypeMode;
private TagInfo tagInfo;
- private final Jar tagJar;
+ private Jar tagJar;
// jspURI _must_ be relative to the context
public JspCompilationContext(String jspUri, Options options,
@@ -310,6 +310,10 @@ public class JspCompilationContext {
return this.tagJar;
}
+ public void setTagFileJar(Jar tagJar) {
+ this.tagJar = tagJar;
+ }
+
/* ==================== Common implementation ==================== */
/**
Modified: tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java?rev=1662201&r1=1662200&r2=1662201&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java Wed Feb 25 11:27:09 2015
@@ -554,6 +554,10 @@ class TagFileProcessor {
// time the tag file was scanned for directives, and the tag
// file may have been modified since then.
wrapper.getJspEngineContext().setTagInfo(tagInfo);
+ // The tagJar passed to to the JspCompilationContext will
+ // have been closed (see the finally block at the end of
+ // this method) so update the the tagJar to one opened above
+ wrapper.getJspEngineContext().setTagFileJar(tagJar);
}
Class<?> tagClazz;
Modified: tomcat/tc8.0.x/trunk/test/org/apache/jasper/TestJspCompilationContext.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/jasper/TestJspCompilationContext.java?rev=1662201&r1=1662200&r2=1662201&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/test/org/apache/jasper/TestJspCompilationContext.java (original)
+++ tomcat/tc8.0.x/trunk/test/org/apache/jasper/TestJspCompilationContext.java Wed Feb 25 11:27:09 2015
@@ -16,6 +16,8 @@
*/
package org.apache.jasper;
+import java.io.File;
+
import javax.servlet.http.HttpServletResponse;
import org.junit.Assert;
@@ -36,6 +38,36 @@ public class TestJspCompilationContext e
"/test/jsp/tagFileInJar.jsp", body, null);
Assert.assertEquals(HttpServletResponse.SC_OK, rc);
+ Assert.assertTrue(body.toString().contains("00 - OK"));
+ }
+
+
+ /*
+ * Test case for https://bz.apache.org/bugzilla/show_bug.cgi?id=57626
+ */
+ @Test
+ public void testModifiedTagFileInJar() throws Exception {
+ getTomcatInstanceTestWebapp(false, true);
+
+ ByteChunk body = new ByteChunk();
+
+ int rc = getUrl("http://localhost:" + getPort() +
+ "/test/jsp/tagFileInJar.jsp", body, null);
+
+ Assert.assertEquals(HttpServletResponse.SC_OK, rc);
+ Assert.assertTrue(body.toString().contains("00 - OK"));
+
+ File jsp = new File("test/webapp/jsp/tagFileInJar.jsp");
+ jsp.setLastModified(jsp.lastModified() + 10000);
+
+ // This test requires that modificationTestInterval is set to zero in
+ // web.xml. If not, a sleep longer that modificationTestInterval is
+ // required here.
+
+ rc = getUrl("http://localhost:" + getPort() +
+ "/test/jsp/tagFileInJar.jsp", body, null);
+
+ Assert.assertEquals(HttpServletResponse.SC_OK, rc);
Assert.assertTrue(body.toString().contains("00 - OK"));
}
}
Modified: tomcat/tc8.0.x/trunk/test/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/webapp/WEB-INF/web.xml?rev=1662201&r1=1662200&r2=1662201&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/test/webapp/WEB-INF/web.xml (original)
+++ tomcat/tc8.0.x/trunk/test/webapp/WEB-INF/web.xml Wed Feb 25 11:27:09 2015
@@ -28,6 +28,25 @@
required.
</description>
+ <servlet>
+ <servlet-name>jsp</servlet-name>
+ <servlet-class>org.apache.jasper.servlet.JspServlet</servlet-class>
+ <init-param>
+ <param-name>fork</param-name>
+ <param-value>false</param-value>
+ </init-param>
+ <init-param>
+ <param-name>xpoweredBy</param-name>
+ <param-value>false</param-value>
+ </init-param>
+ <!-- Required by /jsp/tagFileInJar.jsp / TestJspCompilationContext -->
+ <init-param>
+ <param-name>modificationTestInterval</param-name>
+ <param-value>0</param-value>
+ </init-param>
+ <load-on-startup>3</load-on-startup>
+ </servlet>
+
<!-- Bug 49922 -->
<filter>
<filter-name>Bug49922</filter-name>
Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1662201&r1=1662200&r2=1662201&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Wed Feb 25 11:27:09 2015
@@ -92,9 +92,14 @@
<fix>
<bug>57583</bug>: Cache 'Not Found' results in
<code>javax.el.ImportHandler.resolveClass()</code> to save repeated
- attempts to load classes that are known not to exists to improve
+ attempts to load classes that are known not to exist to improve
performance. (markt)
</fix>
+ <fix>
+ <bug>57626</bug>: Correct a regression introduced in the 8.0.16 fix for
+ ensuring Jars were closed after use, that broke recompilation of
+ modified JSPs that depended on a tag file packaged in a Jar. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Web applications">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org