You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by kk...@apache.org on 2015/02/12 17:39:56 UTC
svn commit: r1659310 -
/tomcat/tc7.0.x/trunk/java/org/apache/jasper/runtime/ProtectedFunctionMapper.java
Author: kkolinko
Date: Thu Feb 12 16:39:55 2015
New Revision: 1659310
URL: http://svn.apache.org/r1659310
Log:
Suppress deprecation warnings.
Remove @Deprecate marker added in r895423:
That method is declared by both javax.servlet.jsp.el.FunctionMapper and by javax.el.FunctionMapper.
The javax.el.* one is not deprecated.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/jasper/runtime/ProtectedFunctionMapper.java
Modified: tomcat/tc7.0.x/trunk/java/org/apache/jasper/runtime/ProtectedFunctionMapper.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/runtime/ProtectedFunctionMapper.java?rev=1659310&r1=1659309&r2=1659310&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/runtime/ProtectedFunctionMapper.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/runtime/ProtectedFunctionMapper.java Thu Feb 12 16:39:55 2015
@@ -35,6 +35,7 @@ import org.apache.jasper.security.Securi
* @author Mark Roth
* @author Kin-man Chung
*/
+@SuppressWarnings("deprecation") // Have to support old JSP EL API
public final class ProtectedFunctionMapper extends javax.el.FunctionMapper
implements FunctionMapper {
@@ -191,7 +192,6 @@ public final class ProtectedFunctionMapp
* @return the result of the method mapping. Null means no entry found.
*/
@Override
- @Deprecated
public Method resolveFunction(String prefix, String localName) {
if (this.fnmap != null) {
return this.fnmap.get(prefix + ":" + localName);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org