Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 83486 invoked from network); 23 Apr 2007 15:11:36 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 23 Apr 2007 15:11:36 -0000 Received: (qmail 60299 invoked by uid 500); 23 Apr 2007 15:11:43 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 60259 invoked by uid 500); 23 Apr 2007 15:11:42 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 60248 invoked by uid 99); 23 Apr 2007 15:11:42 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 23 Apr 2007 08:11:42 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME 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; Mon, 23 Apr 2007 08:11:35 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 5224C1A983E; Mon, 23 Apr 2007 08:11:15 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r531496 - /geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/GeronimoDestination.java Date: Mon, 23 Apr 2007 15:11:14 -0000 To: scm@geronimo.apache.org From: gawor@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070423151115.5224C1A983E@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gawor Date: Mon Apr 23 08:11:11 2007 New Revision: 531496 URL: http://svn.apache.org/viewvc?view=rev&rev=531496 Log: delay setting of the response code Modified: geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/GeronimoDestination.java Modified: geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/GeronimoDestination.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/GeronimoDestination.java?view=diff&rev=531496&r1=531495&r2=531496 ============================================================================== --- geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/GeronimoDestination.java (original) +++ geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/GeronimoDestination.java Mon Apr 23 08:11:11 2007 @@ -211,13 +211,7 @@ public void send(Message message) throws IOException { Response response = (Response)request.get(Response.class); - // 1. handle response code - Integer i = (Integer) message.get(Message.RESPONSE_CODE); - if (i != null) { - response.setStatusCode(i.intValue()); - } - - // 2. handle response headers + // handle response headers updateResponseHeaders(message); Map> protocolHeaders = @@ -331,11 +325,18 @@ return; } + // set response code + Integer i = (Integer) this.message.get(Message.RESPONSE_CODE); + if (i != null) { + this.response.setStatusCode(i.intValue()); + } + + // set content-type setContentType(this.message, this.response); - + this.rawOutputStream = this.response.getOutputStream(); } } -} \ No newline at end of file +}