Return-Path: X-Original-To: apmail-sling-commits-archive@www.apache.org Delivered-To: apmail-sling-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D382210BAA for ; Wed, 5 Jun 2013 17:01:18 +0000 (UTC) Received: (qmail 80936 invoked by uid 500); 5 Jun 2013 17:01:18 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 80879 invoked by uid 500); 5 Jun 2013 17:01:18 -0000 Mailing-List: contact commits-help@sling.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@sling.apache.org Delivered-To: mailing list commits@sling.apache.org Received: (qmail 80872 invoked by uid 99); 5 Jun 2013 17:01:18 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Jun 2013 17:01:18 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Jun 2013 17:01:16 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3AAD0238889B; Wed, 5 Jun 2013 17:00:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1489958 - in /sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl: SlingMainServlet.java log/RequestLoggerResponse.java Date: Wed, 05 Jun 2013 17:00:57 -0000 To: commits@sling.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130605170057.3AAD0238889B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cziegeler Date: Wed Jun 5 17:00:56 2013 New Revision: 1489958 URL: http://svn.apache.org/r1489958 Log: SLING-2908 : Replace StringBuffer with StringBuilder Modified: sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/log/RequestLoggerResponse.java Modified: sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java?rev=1489958&r1=1489957&r2=1489958&view=diff ============================================================================== --- sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java (original) +++ sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java Wed Jun 5 17:00:56 2013 @@ -174,6 +174,7 @@ public class SlingMainServlet extends Ge // ---------- Servlet API ------------------------------------------------- + @Override public void service(ServletRequest req, ServletResponse res) throws ServletException { @@ -582,7 +583,7 @@ public class SlingMainServlet extends Ge // construct and set the new thread name of the form: // 127.0.0.1 [1224156108055] GET /system/console/config HTTP/1.1 - StringBuffer buf = new StringBuffer(); + final StringBuilder buf = new StringBuilder(); buf.append(request.getRemoteAddr()); buf.append(" [").append(System.currentTimeMillis()).append("] "); buf.append(request.getMethod()).append(' '); Modified: sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/log/RequestLoggerResponse.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/log/RequestLoggerResponse.java?rev=1489958&r1=1489957&r2=1489958&view=diff ============================================================================== --- sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/log/RequestLoggerResponse.java (original) +++ sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/log/RequestLoggerResponse.java Wed Jun 5 17:00:56 2013 @@ -159,6 +159,7 @@ class RequestLoggerResponse extends Http this.status = status; } + @Override public void addCookie(Cookie cookie) { // register the cookie for later use @@ -170,26 +171,31 @@ class RequestLoggerResponse extends Http super.addCookie(cookie); } + @Override public void addDateHeader(String name, long date) { this.registerHeader(name, toDateString(date), true); super.addDateHeader(name, date); } + @Override public void addHeader(String name, String value) { this.registerHeader(name, value, true); super.addHeader(name, value); } + @Override public void addIntHeader(String name, int value) { this.registerHeader(name, String.valueOf(value), true); super.addIntHeader(name, value); } + @Override public void setContentLength(int len) { this.registerHeader(HEADER_CONTENT_LENGTH, String.valueOf(len), false); super.setContentLength(len); } + @Override public void setContentType(String type) { // SLING-726 No handling required since this seems to be correct this.registerHeader(HEADER_CONTENT_TYPE, type, false); @@ -204,21 +210,25 @@ class RequestLoggerResponse extends Http } } + @Override public void setDateHeader(String name, long date) { this.registerHeader(name, toDateString(date), false); super.setDateHeader(name, date); } + @Override public void setHeader(String name, String value) { this.registerHeader(name, value, false); super.setHeader(name, value); } + @Override public void setIntHeader(String name, int value) { this.registerHeader(name, String.valueOf(value), false); this.setHeader(name, String.valueOf(value)); } + @Override public void setLocale(Locale loc) { // TODO: Might want to register the Content-Language header super.setLocale(loc); @@ -272,7 +282,7 @@ class RequestLoggerResponse extends Http } else if (header instanceof String) { return (String) header; } else { - StringBuffer headerBuf = new StringBuffer(); + StringBuilder headerBuf = new StringBuilder(); for (Iterator hi = ((List) header).iterator(); hi.hasNext();) { if (headerBuf.length() > 0) { headerBuf.append(","); @@ -288,7 +298,7 @@ class RequestLoggerResponse extends Http /** * Stores the name header-value pair in the header map. The name is * converted to lower-case before using it as an index in the map. - * + * * @param name The name of the header to register * @param value The value of the header to register * @param add If true the header value is added to the list of @@ -332,7 +342,7 @@ class RequestLoggerResponse extends Http * specification. The resulting string is compliant with section 3.3.1, Full * Date, of RFC 2616 and * may thus be used as the value of date header such as Date. - * + * * @param date The date value to convert to a string * @return The string representation of the date and time value. */ @@ -358,25 +368,30 @@ class RequestLoggerResponse extends Http return this.count; } + @Override public void write(int b) throws IOException { this.delegatee.write(b); this.count++; } + @Override public void write(byte[] b) throws IOException { this.delegatee.write(b); this.count += b.length; } + @Override public void write(byte[] b, int off, int len) throws IOException { this.delegatee.write(b, off, len); this.count += len; } + @Override public void flush() throws IOException { this.delegatee.flush(); } + @Override public void close() throws IOException { this.delegatee.close(); } @@ -397,21 +412,25 @@ class RequestLoggerResponse extends Http return this.count; } + @Override public void write(int c) { super.write(c); this.count++; } + @Override public void write(char[] buf, int off, int len) { super.write(buf, off, len); this.count += len; } + @Override public void write(String s, int off, int len) { super.write(s, off, len); this.count += len; } + @Override public void println() { super.println(); this.count += LINE_SEPARATOR_LENGTH;