VelocityPortlet

VelocityPortlet.java.patch

@@ -14,18 +14,18 @@
 
 package com.liferay.portlet;
 
+import com.liferay.portal.kernel.io.unsync.UnsyncStringWriter;
 import com.liferay.portal.kernel.template.Template;
 import com.liferay.portal.kernel.template.TemplateConstants;
 import com.liferay.portal.kernel.template.TemplateManagerUtil;
 import com.liferay.portal.kernel.template.TemplateResource;
 import com.liferay.portal.kernel.template.TemplateResourceLoaderUtil;
 import com.liferay.portal.kernel.util.StringBundler;
-import com.liferay.portal.kernel.util.UnsyncPrintWriterPool;
 import com.liferay.portal.kernel.util.Validator;
 import com.liferay.portal.struts.StrutsUtil;
 
 import java.io.IOException;
-import java.io.PrintWriter;
+import java.io.Writer;
 
 import javax.portlet.ActionRequest;
 import javax.portlet.ActionResponse;
@@ -41,9 +41,6 @@ import javax.portlet.RenderResponse;
 import javax.portlet.ResourceRequest;
 import javax.portlet.ResourceResponse;
 
-import org.apache.velocity.io.VelocityWriter;
-import org.apache.velocity.util.SimplePool;
-
 /**
  * @author Brian Wing Shun Chan
  * @author Steven P. Goldsmith
@@ -198,43 +195,18 @@ public class VelocityPortlet extends GenericPortlet {
 				portletRequest.getResponseContentType());
 		}
 
-		VelocityWriter velocityWriter = null;
-
-		try {
-			velocityWriter = (VelocityWriter)_writerPool.get();
-
-			PrintWriter output = null;
-
-			if (portletResponse instanceof MimeResponse) {
-				MimeResponse mimeResponse = (MimeResponse)portletResponse;
-
-				output = mimeResponse.getWriter();
-			}
-			else {
-				output = UnsyncPrintWriterPool.borrow(System.out);
-			}
+		Writer writer = null;
 
-			if (velocityWriter == null) {
-				velocityWriter = new VelocityWriter(output, 4 * 1024, true);
-			}
-			else {
-				velocityWriter.recycle(output);
-			}
+		if (portletResponse instanceof MimeResponse) {
+			MimeResponse mimeResponse = (MimeResponse)portletResponse;
 
-			template.processTemplate(velocityWriter);
+			writer = mimeResponse.getWriter();
 		}
-		finally {
-			try {
-				if (velocityWriter != null) {
-					velocityWriter.flush();
-					velocityWriter.recycle(null);
-
-					_writerPool.put(velocityWriter);
-				}
-			}
-			catch (Exception e) {
-			}
+		else {
+			writer = new UnsyncStringWriter();
 		}
+
+		template.processTemplate(writer);
 	}
 
 	protected void prepareTemplate(
@@ -272,8 +244,6 @@ public class VelocityPortlet extends GenericPortlet {
 		}
 	}
 
-	private static SimplePool _writerPool = new SimplePool(40);
-
 	private String _actionTemplateId;
 	private String _editTemplateId;
 	private String _helpTemplateId;