diff --git a/.classpath b/.classpath
index 09ffa5a24b9f19..c7eee2341bc58e 100644
--- a/.classpath
+++ b/.classpath
@@ -37,9 +37,9 @@
 	<classpathentry kind="lib" path="lib/development/j2h.jar"/>
 	<classpathentry kind="lib" path="lib/development/jaas.jar"/>
 	<classpathentry kind="lib" path="lib/development/jakarta-regexp.jar"/>
-	<classpathentry kind="lib" path="lib/development/jasper.jar"/>
 	<classpathentry kind="lib" path="lib/development/jalopy.jar"/>
 	<classpathentry kind="lib" path="lib/development/jargs.jar"/>
+	<classpathentry kind="lib" path="lib/development/jasper.jar"/>
 	<classpathentry kind="lib" path="lib/development/jaxb-api.jar"/>
 	<classpathentry kind="lib" path="lib/development/jbi_rt.jar"/>
 	<classpathentry kind="lib" path="lib/development/jetty.jar"/>
diff --git a/lib/versions.html b/lib/versions.html
index f864c649112f93..006fea6cea372e 100644
--- a/lib/versions.html
+++ b/lib/versions.html
@@ -171,12 +171,12 @@
 </tr>
 	
 <tr>
-<td nowrap>development/jasper.jar</td><td nowrap>6.0.32</td><td nowrap><a href="http://tomcat.apache.org">Tomcat</a></td><td nowrap><a href="">Apache License 2.0</a>
-<br>
-</td><td></td>
-</tr>
-	
-<tr>
+<td nowrap>development/jasper.jar</td><td nowrap>6.0.32</td><td nowrap><a href="http://tomcat.apache.org">Tomcat</a></td><td nowrap><a href="">Apache License 2.0</a>
+<br>
+</td><td></td>
+</tr>
+	
+<tr>
 <td nowrap>development/jass.jar</td><td nowrap></td><td nowrap><a href="http://csd.informatik.uni-oldenburg.de/~jass">Jass</a></td><td nowrap><a href="">GPL 2.0</a>
 <br>
 </td><td></td>
diff --git a/nbproject/project.xml b/nbproject/project.xml
index c3380797dcaf8c..f62618c52a5276 100644
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -173,7 +173,7 @@
                 <package-root>util-java/src</package-root>
                 <!--<package-root>util-java/test</package-root>-->
                 <package-root>util-taglib/src</package-root>
-                <classpath mode="compile">lib/development/activation.jar:lib/development/annotations.jar:lib/development/ant-apache-bsf.jar:lib/development/ant-contrib.jar:lib/development/ant-ext.jar:lib/development/ant-installer.jar:lib/development/antelope.jar:lib/development/catalina.jar:lib/development/ckpackager.jar:lib/development/deployment.jar:lib/development/derby.jar:lib/development/derbytools.jar:lib/development/dtddoc.jar:lib/development/dtdparser.jar:lib/development/ecj.jar:lib/development/firebird.jar:lib/development/hamcrest-core.jar:lib/development/hamcrest-library.jar:lib/development/hsql.jar:lib/development/icefaces-comps.jar:lib/development/icefaces-facelets.jar:lib/development/icefaces.jar:lib/development/interbase.jar:lib/development/j2h.jar:lib/development/jaas.jar:lib/development/jakarta-regexp.jar:lib/development/jasper.jar:lib/development/jalopy.jar:lib/development/jargs.jar:lib/development/jaxb-api.jar:lib/development/jbi_rt.jar:lib/development/jetty.jar:lib/development/jetty-util.jar:lib/development/jhighlight.jar:lib/development/jmock.jar:lib/development/jmock-junit4.jar:lib/development/jms.jar:lib/development/jndi.jar:lib/development/jnet.jar:lib/development/jsf-api.jar:lib/development/jsf-facelets.jar:lib/development/jsf-impl.jar:lib/development/jsf-portlet.jar:lib/development/jsp-api.jar:lib/development/jta.jar:lib/development/jtds.jar:lib/development/junit.jar:lib/development/just-ice.jar:lib/development/jutf7.jar:lib/development/jymsg.jar:lib/development/mail.jar:lib/development/myfaces-api.jar:lib/development/myfaces-impl.jar:lib/development/mysql.jar:lib/development/objenesis.jar:lib/development/orangevolt-ant-tasks.jar:lib/development/p6spy.jar:lib/development/persistence.jar:lib/development/postgresql.jar:lib/development/qdox.jar:lib/development/resin.jar:lib/development/sap.jar:lib/development/saxpath.jar:lib/development/script-10.jar:lib/development/sdk-addon-api-0.2.jar:lib/development/selenium-java-client-driver.jar:lib/development/selenium-server.jar:lib/development/servlet-api.jar:lib/development/smtp.jar:lib/development/spring-instrument.jar:lib/development/spring-instrument-tomcat.jar:lib/development/spring-test.jar:lib/development/tomcat-coyote.jar:lib/development/xmltask.jar:lib/global/portlet.jar:lib/portal/abdera.jar:lib/portal/alloy-taglib.jar:lib/portal/ant.jar:lib/portal/antlr2.jar:lib/portal/antlr3-runtime.jar:lib/portal/antlr3.jar:lib/portal/aopalliance.jar:lib/portal/asm-analysis.jar:lib/portal/asm-commons.jar:lib/portal/asm-tree.jar:lib/portal/asm-util.jar:lib/portal/asm-xml.jar:lib/portal/asm.jar:lib/portal/aspectj-rt.jar:lib/portal/aspectj-weaver.jar:lib/portal/axiom-api.jar:lib/portal/axiom-impl.jar:lib/portal/axis-ant.jar:lib/portal/axis.jar:lib/portal/backport-concurrent.jar:lib/portal/bcmail.jar:lib/portal/bcprov.jar:lib/portal/bobo-browse.jar:lib/portal/bsh.jar:lib/portal/bsf.jar:lib/portal/c3p0.jar:lib/portal/cas-client-core.jar:lib/portal/ccpp-ri.jar:lib/portal/ccpp.jar:lib/portal/cglib.jar:lib/portal/chardet.jar:lib/portal/chemistry-opencmis-client-api.jar:lib/portal/chemistry-opencmis-client-bindings.jar:lib/portal/chemistry-opencmis-client-impl.jar:lib/portal/chemistry-opencmis-commons-api.jar:lib/portal/chemistry-opencmis-commons-impl.jar:lib/portal/commons-beanutils.jar:lib/portal/commons-codec.jar:lib/portal/commons-collections.jar:lib/portal/commons-compress.jar:lib/portal/commons-configuration.jar:lib/portal/commons-dbcp.jar:lib/portal/commons-digester.jar:lib/portal/commons-discovery.jar:lib/portal/commons-email.jar:lib/portal/commons-fileupload.jar:lib/portal/commons-httpclient.jar:lib/portal/commons-io.jar:lib/portal/commons-lang.jar:lib/portal/commons-logging.jar:lib/portal/commons-math.jar:lib/portal/commons-pool.jar:lib/portal/commons-validator.jar:lib/portal/compass.jar:lib/portal/concurrent.jar:lib/portal/crypt.jar:lib/portal/daim.jar:lib/portal/daisydiff.jar:lib/portal/displaytag.jar:lib/portal/dom4j.jar:lib/portal/easyconf.jar:lib/portal/eclipselink.jar:lib/portal/eclipse-core-runtime.jar:lib/portal/ecs.jar:lib/portal/ehcache-jgroupsreplication.jar:lib/portal/ehcache.jar:lib/portal/fastutil.jar:lib/portal/flexjson.jar:lib/portal/fontbox.jar:lib/portal/freemarker.jar:lib/portal/freshcookies-security.jar:lib/portal/gif89.jar:lib/portal/groovy.jar:lib/portal/gt-coverage.jar:lib/portal/gt-metadata.jar:lib/portal/hessian.jar:lib/portal/hibernate3.jar:lib/portal/h™lparser.jar:lib/portal/ical4j.jar:lib/portal/icq.jar:lib/portal/im4java.jar:lib/portal/jabsorb.jar:lib/portal/jackrabbit-api.jar:lib/portal/jackrabbit-core.jar:lib/portal/jackrabbit-jcr-commons.jar:lib/portal/jackrabbit-spi-commons.jar:lib/portal/jackrabbit-spi.jar:lib/portal/jai_codec.jar:lib/portal/jai_core.jar:lib/portal/jamwiki-core.jar:lib/portal/javassist.jar:lib/portal/java-diff.jar:lib/portal/jaxb-impl.jar:lib/portal/jaxen.jar:lib/portal/jaxrpc.jar:lib/portal/jaxws-rt.jar:lib/portal/jazzy.jar:lib/portal/jcifs.jar:lib/portal/jcommon.jar:lib/portal/jcr.jar:lib/portal/jdom.jar:lib/portal/jempbox.jar:lib/portal/jena.jar:lib/portal/jericho-html.jar:lib/portal/jets3t.jar:lib/portal/jfreechart.jar:lib/portal/jgroups.jar:lib/portal/jhlabs-filters.jar:lib/portal/jodconverter.jar:lib/portal/jodd-wot.jar:lib/portal/jodd.jar:lib/portal/jrcs-diff.jar:lib/portal/jruby.jar:lib/portal/jsonrpc.jar:lib/portal/jspwiki.jar:lib/portal/jsr107cache.jar:lib/portal/jstl-api.jar:lib/portal/jstl-impl.jar:lib/portal/juh.jar:lib/portal/jurt.jar:lib/portal/jython.jar:lib/portal/liferay-icu4j.jar:lib/portal/liferay-rhino.jar:lib/portal/liferay-yuicompressor.jar:lib/portal/log4j.jar:lib/portal/lucene-analyzers.jar:lib/portal/lucene-core.jar:lib/portal/lucene-highlighter.jar:lib/portal/lucene-memory.jar:lib/portal/memcached.jar:lib/portal/metadata-extractor.jar:lib/portal/mimepull.jar:lib/portal/msnm.jar:lib/portal/nekoh™l.jar:lib/portal/odmg.jar:lib/portal/openid4java.jar:lib/portal/oro.jar:lib/portal/pdfbox.jar:lib/portal/poi-ooxml-schemas.jar:lib/portal/poi-ooxml.jar:lib/portal/poi-scratchpad.jar:lib/portal/poi.jar:lib/portal/portal-client.jar:lib/portal/portals-bridges.jar:lib/portal/portletbridge-core.jar:lib/portal/portletbridge-portlet.jar:lib/portal/primrose.jar:lib/portal/quartz.jar:lib/portal/rdffilter.jar:lib/portal/ridl.jar:lib/portal/rome.jar:lib/portal/ruby-gems.jar:lib/portal/saaj-api.jar:lib/portal/saaj-impl.jar:lib/portal/scribe.jar:lib/portal/serializer.jar:lib/portal/simplecaptcha.jar:lib/portal/slf4j-api.jar:lib/portal/slf4j-log4j12.jar:lib/portal/soap.jar:lib/portal/spring-aop.jar:lib/portal/spring-asm.jar:lib/portal/spring-aspects.jar:lib/portal/spring-beans.jar:lib/portal/spring-context.jar:lib/portal/spring-context-support.jar:lib/portal/spring-core.jar:lib/portal/spring-expression.jar:lib/portal/spring-jdbc.jar:lib/portal/spring-jms.jar:lib/portal/spring-orm.jar:lib/portal/spring-oxm.jar:lib/portal/spring-transaction.jar:lib/portal/spring-web.jar:lib/portal/spring-web-portlet.jar:lib/portal/spring-web-servlet.jar:lib/portal/spring-web-struts.jar:lib/portal/stax-ex.jar:lib/portal/stax.jar:lib/portal/streambuffer.jar:lib/portal/stringtemplate.jar:lib/portal/struts-el.jar:lib/portal/struts.jar:lib/portal/tagsoup.jar:lib/portal/tika-core.jar:lib/portal/tika-parsers.jar:lib/portal/truezip.jar:lib/portal/unoil.jar:lib/portal/urlrewrite.jar:lib/portal/vaadin.jar:lib/portal/velocity-tools.jar:lib/portal/velocity.jar:lib/portal/wsdl4j.jar:lib/portal/wstx.jar:lib/portal/xalan.jar:lib/portal/xbean.jar:lib/portal/xbean-spring.jar:lib/portal/xercesImpl.jar:lib/portal/xml-apis.jar:lib/portal/xmlsec.jar:lib/portal/xpp3.jar:lib/portal/xstream.jar:lib/portal/xuggle-xuggler.jar</classpath>
+                <classpath mode="compile">lib/development/activation.jar:lib/development/annotations.jar:lib/development/ant-apache-bsf.jar:lib/development/ant-contrib.jar:lib/development/ant-ext.jar:lib/development/ant-installer.jar:lib/development/antelope.jar:lib/development/catalina.jar:lib/development/ckpackager.jar:lib/development/deployment.jar:lib/development/derby.jar:lib/development/derbytools.jar:lib/development/dtddoc.jar:lib/development/dtdparser.jar:lib/development/ecj.jar:lib/development/firebird.jar:lib/development/hamcrest-core.jar:lib/development/hamcrest-library.jar:lib/development/hsql.jar:lib/development/icefaces-comps.jar:lib/development/icefaces-facelets.jar:lib/development/icefaces.jar:lib/development/interbase.jar:lib/development/j2h.jar:lib/development/jaas.jar:lib/development/jakarta-regexp.jar:lib/development/jalopy.jar:lib/development/jargs.jar:lib/development/jasper.jar:lib/development/jaxb-api.jar:lib/development/jbi_rt.jar:lib/development/jetty.jar:lib/development/jetty-util.jar:lib/development/jhighlight.jar:lib/development/jmock.jar:lib/development/jmock-junit4.jar:lib/development/jms.jar:lib/development/jndi.jar:lib/development/jnet.jar:lib/development/jsf-api.jar:lib/development/jsf-facelets.jar:lib/development/jsf-impl.jar:lib/development/jsf-portlet.jar:lib/development/jsp-api.jar:lib/development/jta.jar:lib/development/jtds.jar:lib/development/junit.jar:lib/development/just-ice.jar:lib/development/jutf7.jar:lib/development/jymsg.jar:lib/development/mail.jar:lib/development/myfaces-api.jar:lib/development/myfaces-impl.jar:lib/development/mysql.jar:lib/development/objenesis.jar:lib/development/orangevolt-ant-tasks.jar:lib/development/p6spy.jar:lib/development/persistence.jar:lib/development/postgresql.jar:lib/development/qdox.jar:lib/development/resin.jar:lib/development/sap.jar:lib/development/saxpath.jar:lib/development/script-10.jar:lib/development/sdk-addon-api-0.2.jar:lib/development/selenium-java-client-driver.jar:lib/development/selenium-server.jar:lib/development/servlet-api.jar:lib/development/smtp.jar:lib/development/spring-instrument.jar:lib/development/spring-instrument-tomcat.jar:lib/development/spring-test.jar:lib/development/tomcat-coyote.jar:lib/development/xmltask.jar:lib/global/portlet.jar:lib/portal/abdera.jar:lib/portal/alloy-taglib.jar:lib/portal/ant.jar:lib/portal/antlr2.jar:lib/portal/antlr3-runtime.jar:lib/portal/antlr3.jar:lib/portal/aopalliance.jar:lib/portal/asm-analysis.jar:lib/portal/asm-commons.jar:lib/portal/asm-tree.jar:lib/portal/asm-util.jar:lib/portal/asm-xml.jar:lib/portal/asm.jar:lib/portal/aspectj-rt.jar:lib/portal/aspectj-weaver.jar:lib/portal/axiom-api.jar:lib/portal/axiom-impl.jar:lib/portal/axis-ant.jar:lib/portal/axis.jar:lib/portal/backport-concurrent.jar:lib/portal/bcmail.jar:lib/portal/bcprov.jar:lib/portal/bobo-browse.jar:lib/portal/bsh.jar:lib/portal/bsf.jar:lib/portal/c3p0.jar:lib/portal/cas-client-core.jar:lib/portal/ccpp-ri.jar:lib/portal/ccpp.jar:lib/portal/cglib.jar:lib/portal/chardet.jar:lib/portal/chemistry-opencmis-client-api.jar:lib/portal/chemistry-opencmis-client-bindings.jar:lib/portal/chemistry-opencmis-client-impl.jar:lib/portal/chemistry-opencmis-commons-api.jar:lib/portal/chemistry-opencmis-commons-impl.jar:lib/portal/commons-beanutils.jar:lib/portal/commons-codec.jar:lib/portal/commons-collections.jar:lib/portal/commons-compress.jar:lib/portal/commons-configuration.jar:lib/portal/commons-dbcp.jar:lib/portal/commons-digester.jar:lib/portal/commons-discovery.jar:lib/portal/commons-email.jar:lib/portal/commons-fileupload.jar:lib/portal/commons-httpclient.jar:lib/portal/commons-io.jar:lib/portal/commons-lang.jar:lib/portal/commons-logging.jar:lib/portal/commons-math.jar:lib/portal/commons-pool.jar:lib/portal/commons-validator.jar:lib/portal/compass.jar:lib/portal/concurrent.jar:lib/portal/crypt.jar:lib/portal/daim.jar:lib/portal/daisydiff.jar:lib/portal/displaytag.jar:lib/portal/dom4j.jar:lib/portal/easyconf.jar:lib/portal/eclipselink.jar:lib/portal/eclipse-core-runtime.jar:lib/portal/ecs.jar:lib/portal/ehcache-jgroupsreplication.jar:lib/portal/ehcache.jar:lib/portal/fastutil.jar:lib/portal/flexjson.jar:lib/portal/fontbox.jar:lib/portal/freemarker.jar:lib/portal/freshcookies-security.jar:lib/portal/gif89.jar:lib/portal/groovy.jar:lib/portal/gt-coverage.jar:lib/portal/gt-metadata.jar:lib/portal/hessian.jar:lib/portal/hibernate3.jar:lib/portal/h™lparser.jar:lib/portal/ical4j.jar:lib/portal/icq.jar:lib/portal/im4java.jar:lib/portal/jabsorb.jar:lib/portal/jackrabbit-api.jar:lib/portal/jackrabbit-core.jar:lib/portal/jackrabbit-jcr-commons.jar:lib/portal/jackrabbit-spi-commons.jar:lib/portal/jackrabbit-spi.jar:lib/portal/jai_codec.jar:lib/portal/jai_core.jar:lib/portal/jamwiki-core.jar:lib/portal/javassist.jar:lib/portal/java-diff.jar:lib/portal/jaxb-impl.jar:lib/portal/jaxen.jar:lib/portal/jaxrpc.jar:lib/portal/jaxws-rt.jar:lib/portal/jazzy.jar:lib/portal/jcifs.jar:lib/portal/jcommon.jar:lib/portal/jcr.jar:lib/portal/jdom.jar:lib/portal/jempbox.jar:lib/portal/jena.jar:lib/portal/jericho-html.jar:lib/portal/jets3t.jar:lib/portal/jfreechart.jar:lib/portal/jgroups.jar:lib/portal/jhlabs-filters.jar:lib/portal/jodconverter.jar:lib/portal/jodd-wot.jar:lib/portal/jodd.jar:lib/portal/jrcs-diff.jar:lib/portal/jruby.jar:lib/portal/jsonrpc.jar:lib/portal/jspwiki.jar:lib/portal/jsr107cache.jar:lib/portal/jstl-api.jar:lib/portal/jstl-impl.jar:lib/portal/juh.jar:lib/portal/jurt.jar:lib/portal/jython.jar:lib/portal/liferay-icu4j.jar:lib/portal/liferay-rhino.jar:lib/portal/liferay-yuicompressor.jar:lib/portal/log4j.jar:lib/portal/lucene-analyzers.jar:lib/portal/lucene-core.jar:lib/portal/lucene-highlighter.jar:lib/portal/lucene-memory.jar:lib/portal/memcached.jar:lib/portal/metadata-extractor.jar:lib/portal/mimepull.jar:lib/portal/msnm.jar:lib/portal/nekoh™l.jar:lib/portal/odmg.jar:lib/portal/openid4java.jar:lib/portal/oro.jar:lib/portal/pdfbox.jar:lib/portal/poi-ooxml-schemas.jar:lib/portal/poi-ooxml.jar:lib/portal/poi-scratchpad.jar:lib/portal/poi.jar:lib/portal/portal-client.jar:lib/portal/portals-bridges.jar:lib/portal/portletbridge-core.jar:lib/portal/portletbridge-portlet.jar:lib/portal/primrose.jar:lib/portal/quartz.jar:lib/portal/rdffilter.jar:lib/portal/ridl.jar:lib/portal/rome.jar:lib/portal/ruby-gems.jar:lib/portal/saaj-api.jar:lib/portal/saaj-impl.jar:lib/portal/scribe.jar:lib/portal/serializer.jar:lib/portal/simplecaptcha.jar:lib/portal/slf4j-api.jar:lib/portal/slf4j-log4j12.jar:lib/portal/soap.jar:lib/portal/spring-aop.jar:lib/portal/spring-asm.jar:lib/portal/spring-aspects.jar:lib/portal/spring-beans.jar:lib/portal/spring-context.jar:lib/portal/spring-context-support.jar:lib/portal/spring-core.jar:lib/portal/spring-expression.jar:lib/portal/spring-jdbc.jar:lib/portal/spring-jms.jar:lib/portal/spring-orm.jar:lib/portal/spring-oxm.jar:lib/portal/spring-transaction.jar:lib/portal/spring-web.jar:lib/portal/spring-web-portlet.jar:lib/portal/spring-web-servlet.jar:lib/portal/spring-web-struts.jar:lib/portal/stax-ex.jar:lib/portal/stax.jar:lib/portal/streambuffer.jar:lib/portal/stringtemplate.jar:lib/portal/struts-el.jar:lib/portal/struts.jar:lib/portal/tagsoup.jar:lib/portal/tika-core.jar:lib/portal/tika-parsers.jar:lib/portal/truezip.jar:lib/portal/unoil.jar:lib/portal/urlrewrite.jar:lib/portal/vaadin.jar:lib/portal/velocity-tools.jar:lib/portal/velocity.jar:lib/portal/wsdl4j.jar:lib/portal/wstx.jar:lib/portal/xalan.jar:lib/portal/xbean.jar:lib/portal/xbean-spring.jar:lib/portal/xercesImpl.jar:lib/portal/xml-apis.jar:lib/portal/xmlsec.jar:lib/portal/xpp3.jar:lib/portal/xstream.jar:lib/portal/xuggle-xuggler.jar</classpath>
                 <source-level>1.5</source-level>
             </compilation-unit>
         </java-data>
diff --git a/support-tomcat/src/com/liferay/support/tomcat/jasper/runtime/TagHandlerPool.java b/support-tomcat/src/com/liferay/support/tomcat/jasper/runtime/TagHandlerPool.java
index a5df201f54d554..df5506caff608c 100644
--- a/support-tomcat/src/com/liferay/support/tomcat/jasper/runtime/TagHandlerPool.java
+++ b/support-tomcat/src/com/liferay/support/tomcat/jasper/runtime/TagHandlerPool.java
@@ -27,13 +27,18 @@
 import org.apache.jasper.Constants;
 
 /**
+ * <p>
+ * See http://issues.liferay.com/browse/LPS-19130.
+ * </p>
+ *
  * @author Shuyang Zhou
  */
 public class TagHandlerPool extends org.apache.jasper.runtime.TagHandlerPool {
 
+	@SuppressWarnings("rawtypes")
 	@Override
 	public Tag get(Class tagClass) throws JspException {
-		Tag tag = _tagPool.poll();
+		Tag tag = _tags.poll();
 
 		if (tag == null) {
 			try {
@@ -49,9 +54,9 @@ public Tag get(Class tagClass) throws JspException {
 
 	@Override
 	public void release() {
-		Tag tag;
+		Tag tag = null;
 
-		while ((tag = _tagPool.poll()) != null) {
+		while ((tag = _tags.poll()) != null) {
 			tag.release();
 		}
 	}
@@ -60,7 +65,8 @@ public void release() {
 	public void reuse(Tag tag) {
 		if (_counter.get() < _maxSize) {
 			_counter.getAndIncrement();
-			_tagPool.offer(tag);
+
+			_tags.offer(tag);
 		}
 
 		tag.release();
@@ -74,6 +80,6 @@ protected void init(ServletConfig config) {
 
 	private AtomicInteger _counter = new AtomicInteger();
 	private int _maxSize;
-	private Queue<Tag> _tagPool = new ConcurrentLinkedQueue<Tag>();
+	private Queue<Tag> _tags = new ConcurrentLinkedQueue<Tag>();
 
 }
\ No newline at end of file