Author: markt Date: Fri Jan 27 08:22:43 2017 New Revision: 1780515 URL: http://svn.apache.org/viewvc?rev=1780515&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=1780515&r1=1780514&r2=1780515&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:22:43 2017 @@ -2485,24 +2485,21 @@ class Generator { } private void writeNewInstance(String tagHandlerVar, String tagHandlerClassName) { + out.printin(tagHandlerClassName); + out.print(" "); + out.print(tagHandlerVar); + out.print(" = "); if (Constants.USE_INSTANCE_MANAGER_FOR_TAGS) { - out.printin(tagHandlerClassName); - out.print(" "); - out.print(tagHandlerVar); - out.print(" = ("); + out.print("("); out.print(tagHandlerClassName); out.print(")"); out.print("_jsp_getInstanceManager().newInstance(\""); out.print(tagHandlerClassName); out.println("\", this.getClass().getClassLoader());"); } else { - out.printin(tagHandlerClassName); - out.print(" "); - out.print(tagHandlerVar); - out.print(" = ("); out.print("new "); out.print(tagHandlerClassName); - out.println("());"); + out.println("();"); out.printin("_jsp_getInstanceManager().newInstance("); out.print(tagHandlerVar); out.println(");"); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org