Author: markt
Date: Fri Jan 27 08:31:35 2017
New Revision: 1780516
URL: http://svn.apache.org/viewvc?rev=1780516&view=rev
Log:
Reduce duplicated generation code.
No functional change.
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Generator.java?rev=1780516&r1=1780515&r2=1780516&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/Generator.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Generator.java Fri Jan 27
08:31:35 2017
@@ -2409,14 +2409,6 @@ class Generator {
// includes setting the context
generateSetters(n, tagHandlerVar, handlerInfo, false);
- // JspIdConsumer (after context has been set)
- if (n.implementsJspIdConsumer()) {
- out.printin(tagHandlerVar);
- out.print(".setJspId(\"");
- out.print(createJspId());
- out.println("\");");
- }
-
if (n.implementsTryCatchFinally()) {
out.printin("int[] ");
out.print(tagPushBodyCountVar);
@@ -2653,14 +2645,6 @@ class Generator {
generateSetters(n, tagHandlerVar, handlerInfo, true);
- // JspIdConsumer (after context has been set)
- if (n.implementsJspIdConsumer()) {
- out.printin(tagHandlerVar);
- out.print(".setJspId(\"");
- out.print(createJspId());
- out.println("\");");
- }
-
// Set the body
if (findJspBody(n) == null) {
/*
@@ -3255,6 +3239,14 @@ class Generator {
out.println(");");
}
}
+
+ // JspIdConsumer (after context has been set)
+ if (n.implementsJspIdConsumer()) {
+ out.printin(tagHandlerVar);
+ out.print(".setJspId(\"");
+ out.print(createJspId());
+ out.println("\");");
+ }
}
/*
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
