Return-Path: Delivered-To: apmail-incubator-abdera-commits-archive@locus.apache.org Received: (qmail 4365 invoked from network); 24 Aug 2007 18:27:36 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 24 Aug 2007 18:27:36 -0000 Received: (qmail 73116 invoked by uid 500); 24 Aug 2007 18:27:33 -0000 Delivered-To: apmail-incubator-abdera-commits-archive@incubator.apache.org Received: (qmail 73085 invoked by uid 500); 24 Aug 2007 18:27:33 -0000 Mailing-List: contact abdera-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: abdera-dev@incubator.apache.org Delivered-To: mailing list abdera-commits@incubator.apache.org Received: (qmail 73076 invoked by uid 99); 24 Aug 2007 18:27:33 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Aug 2007 11:27:33 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Aug 2007 18:27:36 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E94111A9832; Fri, 24 Aug 2007 11:27:15 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r569474 - /incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/AbstractRequestHandler.java Date: Fri, 24 Aug 2007 18:27:15 -0000 To: abdera-commits@incubator.apache.org From: jmsnell@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20070824182715.E94111A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jmsnell Date: Fri Aug 24 11:27:15 2007 New Revision: 569474 URL: http://svn.apache.org/viewvc?rev=569474&view=rev Log: Apply Brian Moseley's head response patch. Modified: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/AbstractRequestHandler.java Modified: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/AbstractRequestHandler.java URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/AbstractRequestHandler.java?rev=569474&r1=569473&r2=569474&view=diff ============================================================================== --- incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/AbstractRequestHandler.java (original) +++ incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/AbstractRequestHandler.java Fri Aug 24 11:27:15 2007 @@ -55,12 +55,12 @@ log.debug(Messages.format("USING.PROVIDER",provider)); try { if (preconditions(provider, request, response)) { - output(response,provider.request(request)); + output(request, response,provider.request(request)); } } catch (Throwable e) { log.error(Messages.get("OUTPUT.ERROR"), e); try { - output(response,new EmptyResponseContext(500)); + output(request,response,new EmptyResponseContext(500)); } catch (Exception ex) { log.error(Messages.get("OUTPUT.ERROR"), ex); response.sendError(500); @@ -99,6 +99,7 @@ } protected void output( + RequestContext request, HttpServletResponse response, ResponseContext context) throws IOException, ServletException { @@ -126,7 +127,7 @@ } } } - if (context.hasEntity()) { + if (!request.getMethod().equals("HEAD") && context.hasEntity()) { OutputStream out = response.getOutputStream(); context.writeTo(out); out.close();