svn commit: r781759 - in /tomcat: container/tc5.5.x/webapps/docs/changelog.xml jasper/tc5.5.x/src/share/org/apache/jasper/compiler/Generator.java

[markt]

Author: markt
Date: Thu Jun  4 14:49:33 2009
New Revision: 781759

URL: http://svn.apache.org/viewvc?rev=781759&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46909
The ';' should really only be used if there is a following parameter

Modified:
    tomcat/container/tc5.5.x/webapps/docs/changelog.xml
    tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/Generator.java

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=781759&r1=781758&r2=781759&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Thu Jun  4 14:49:33 2009
@@ -160,6 +160,10 @@
         org.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER=true. Patch
         provided by Konstantin Kolinko. (markt)
       </fix>
+      <fix>
+        <bug>46909</bug>: Only include semi-colon in type attribute for
+        &lt;jsp:plugin&gt; when it is required. (markt)  
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Cluster">

Modified: 
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/Generator.java
URL: 
http://svn.apache.org/viewvc/tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/Generator.java?rev=781759&r1=781758&r2=781759&view=diff
==============================================================================
--- tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/Generator.java 
(original)
+++ tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/Generator.java 
Thu Jun  4 14:49:33 2009
@@ -1522,10 +1522,9 @@
                         "value",
                         "application/x-java-"
                             + type
-                            + ";"
                             + ((jreversion == null)
                                 ? ""
-                                : "version=" + jreversion))
+                                : ";version=" + jreversion))
                     + '>';
             out.printil("out.write(" + quote(s0) + ");");
             out.printil("out.write(\"\\n\");");
@@ -1546,10 +1545,9 @@
                         "type",
                         "application/x-java-"
                             + type
-                            + ";"
                             + ((jreversion == null)
                                 ? ""
-                                : "version=" + jreversion))
+                                : ";version=" + jreversion))
                     + makeAttr("name", name);
 
             // s1 and s2 are the same as before.



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org