Author: markt
Date: Sat Jan 18 21:24:37 2014
New Revision: 1559419
URL: http://svn.apache.org/r1559419
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56012
Imports from unnamed packages are now explicitly illegal
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/PageInfo.java
tomcat/trunk/java/org/apache/jasper/compiler/Validator.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/PageInfo.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/PageInfo.java?rev=1559419&r1=1559418&r2=1559419&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/PageInfo.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/PageInfo.java Sat Jan 18
21:24:37 2014
@@ -394,17 +394,16 @@ class PageInfo {
/*
* extends
*/
- public void setExtends(String value, Node.PageDirective n) {
-
+ public void setExtends(String value) {
xtends = value;
+ }
- /*
- * If page superclass is top level class (i.e. not in a package)
- * explicitly import it. If this is not done, the compiler will assume
- * the extended class is in the same pkg as the generated servlet.
- */
- if (value.indexOf('.') < 0)
- n.addImport(value);
+ /**
+ * @deprecated Use {@link #setExtends(String)}
+ */
+ @Deprecated
+ public void setExtends(String value, @SuppressWarnings("unused")
Node.PageDirective n) {
+ xtends = value;
}
/**
Modified: tomcat/trunk/java/org/apache/jasper/compiler/Validator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Validator.java?rev=1559419&r1=1559418&r2=1559419&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/Validator.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Validator.java Sat Jan 18
21:24:37 2014
@@ -123,7 +123,7 @@ class Validator {
}
} else if ("extends".equals(attr)) {
if (pageInfo.getExtends(false) == null) {
- pageInfo.setExtends(value, n);
+ pageInfo.setExtends(value);
} else if (!pageInfo.getExtends(false).equals(value)) {
err.jspError(n, "jsp.error.page.conflict.extends",
pageInfo.getExtends(false), value);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
