Author: kkolinko
Date: Fri Feb 13 11:07:07 2015
New Revision: 1659506
URL: http://svn.apache.org/r1659506
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57574
Do not perform package existence check in ImportHandler.importPackage()
Merged r1659505 from tomcat/trunk.
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/javax/el/ImportHandler.java
tomcat/tc8.0.x/trunk/java/javax/el/LocalStrings.properties
tomcat/tc8.0.x/trunk/test/javax/el/TestImportHandler.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 13 11:07:07 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
+/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
Modified: tomcat/tc8.0.x/trunk/java/javax/el/ImportHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/javax/el/ImportHandler.java?rev=1659506&r1=1659505&r2=1659506&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/javax/el/ImportHandler.java (original)
+++ tomcat/tc8.0.x/trunk/java/javax/el/ImportHandler.java Fri Feb 13 11:07:07
2015
@@ -19,7 +19,6 @@ package javax.el;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
-import java.net.URL;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -124,18 +123,10 @@ public class ImportHandler {
public void importPackage(String name) {
// Import ambiguity is handled at resolution, not at import
- Package p = Package.getPackage(name);
- if (p == null) {
- // Either the package does not exist or no class has been loaded
- // from that package. Check if the package exists.
- ClassLoader cl = Thread.currentThread().getContextClassLoader();
- String path = name.replace('.', '/');
- URL url = cl.getResource(path);
- if (url == null) {
- throw new ELException(Util.message(
- null, "importHandler.invalidPackage", name));
- }
- }
+ // Whether the package exists is not checked,
+ // a) for sake of performance when used in JSPs (BZ 57142),
+ // b) java.lang.Package.getPackage(name) is not reliable (BZ 57574),
+ // c) such check is not required by specification.
packageNames.add(name);
}
Modified: tomcat/tc8.0.x/trunk/java/javax/el/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/javax/el/LocalStrings.properties?rev=1659506&r1=1659505&r2=1659506&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/javax/el/LocalStrings.properties (original)
+++ tomcat/tc8.0.x/trunk/java/javax/el/LocalStrings.properties Fri Feb 13
11:07:07 2015
@@ -37,7 +37,6 @@ importHandler.classNotFound=The class [{
importHandler.invalidClass=The class [{0}] must be public, non-abstract and
not an interface
importHandler.invalidClassName=Name of class to import [{0}] must include a
package
importHandler.invalidClassNameForStatic=The class [{0}] specified for static
import [{1}] is not valid
-importHandler.invalidPackage=The package [{0}] could not be found
importHandler.invalidStaticName=Name of static method or field to import [{0}]
must include a class
importHandler.staticNotFound=The static import [{0}] could not be found in
class [{1}] for import [{2}]
Modified: tomcat/tc8.0.x/trunk/test/javax/el/TestImportHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/javax/el/TestImportHandler.java?rev=1659506&r1=1659505&r2=1659506&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/test/javax/el/TestImportHandler.java (original)
+++ tomcat/tc8.0.x/trunk/test/javax/el/TestImportHandler.java Fri Feb 13
11:07:07 2015
@@ -183,15 +183,16 @@ public class TestImportHandler {
}
-
/**
* Import an invalid package.
*/
- @Test(expected=ELException.class)
- public void testImportPackage01() {
+ @Test
+ public void testImportPackage01_57574() {
ImportHandler handler = new ImportHandler();
handler.importPackage("org.apache.tomcat.foo");
+
+ // No exception is expected
}
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=1659506&r1=1659505&r2=1659506&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Fri Feb 13 11:07:07 2015
@@ -143,6 +143,10 @@
Simplify code in <code>ProtectedFunctionMapper</code> class of
Jasper runtime. (kkolinko)
</fix>
+ <fix>
+ <bug>57574</bug>: Do not check existence of a Java package in
+ <code>javax.el.ImportHandler.importPackage()</code>. (kkolinko)
+ </fix>
</changelog>
</subsection>
<subsection name="WebSocket">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
