Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46909

The ';' should really only be used if there is a following parameter

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@763611 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/jasper/compiler/Generator.java b/java/org/apache/jasper/compiler/Generator.java
index 7764270..fb58986 100644 (file)
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -1574,8 +1574,7 @@ class Generator {
             s0 = "<param name=\"type\""
                     + makeAttr("value", "application/x-java-"
                             + type
-                            + ";"
-                            + ((jreversion == null) ? "" : "version="
+                            + ((jreversion == null) ? "" : ";version="
                                     + jreversion)) + '>';
             out.printil("out.write(" + quote(s0) + ");");
             out.printil("out.write(\"\\n\");");
@@ -1594,8 +1593,7 @@ class Generator {
             s0 = "<EMBED"
                     + makeAttr("type", "application/x-java-"
                             + type
-                            + ";"
-                            + ((jreversion == null) ? "" : "version="
+                            + ((jreversion == null) ? "" : ";version="
                                     + jreversion)) + makeAttr("name", name);
 
             // s1 and s2 are the same as before.