Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 21836 invoked from network); 27 Aug 2008 19:54:54 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 27 Aug 2008 19:54:54 -0000 Received: (qmail 35012 invoked by uid 500); 27 Aug 2008 19:54:52 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 34968 invoked by uid 500); 27 Aug 2008 19:54:52 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 34959 invoked by uid 99); 27 Aug 2008 19:54:52 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 27 Aug 2008 12:54:52 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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, 27 Aug 2008 19:54:03 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A4B0C238889B; Wed, 27 Aug 2008 12:54:33 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r689596 - /cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java Date: Wed, 27 Aug 2008 19:54:33 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080827195433.A4B0C238889B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Wed Aug 27 12:54:33 2008 New Revision: 689596 URL: http://svn.apache.org/viewvc?rev=689596&view=rev Log: Fix some tck failures cause by my last commit Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java?rev=689596&r1=689595&r2=689596&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java (original) +++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java Wed Aug 27 12:54:33 2008 @@ -123,7 +123,7 @@ if (scopes == null && reqMessage != null) { scopes = CastUtils.cast((Map)reqMessage.get(SCOPES)); m.put(SCOPES, scopes); - copyScoped(message); + copyScoped(reqMessage); } if (scopes == null) { scopes = new HashMap(); @@ -206,7 +206,8 @@ } ret = createAttachments(getWrappedMessage(), MessageContext.INBOUND_MESSAGE_ATTACHMENTS); } else if (MessageContext.OUTBOUND_MESSAGE_ATTACHMENTS.equals(key)) { - ret = createAttachments(createResponseMessage(), MessageContext.OUTBOUND_MESSAGE_ATTACHMENTS); + ret = createAttachments(isRequestor() ? getWrappedMessage() : createResponseMessage(), + MessageContext.OUTBOUND_MESSAGE_ATTACHMENTS); } else if (MessageContext.MESSAGE_OUTBOUND_PROPERTY.equals(key)) { ret = isOutbound(); } else if (MessageContext.HTTP_REQUEST_HEADERS.equals(key)) { @@ -249,19 +250,40 @@ } private Message createResponseMessage() { - if (exchange == null || isRequestor()) { + if (exchange == null || exchange.isOneWay()) { return null; } - Message m = exchange.getOutMessage(); - if (m == null && !exchange.isOneWay()) { - Endpoint ep = exchange.get(Endpoint.class); - m = ep.getBinding().createMessage(); - exchange.setOutMessage(m); + if (isResponse()) { + return getWrappedMessage(); + } + Message m = null; + if (isRequestor()) { + m = exchange.getInFaultMessage(); + if (m == null) { + m = exchange.getInMessage(); + } + if (m == null) { + Endpoint ep = exchange.get(Endpoint.class); + m = ep.getBinding().createMessage(); + exchange.setInMessage(m); + } + } else { + m = exchange.getOutMessage(); + if (m == null) { + m = exchange.getOutFaultMessage(); + } + if (m == null) { + Endpoint ep = exchange.get(Endpoint.class); + m = ep.getBinding().createMessage(); + exchange.setOutMessage(m); + } } return m; } private Object createAttachments(Message mc, String propertyName) { - + if (mc == null) { + return null; + } Collection attachments = mc.getAttachments(); Map dataHandlers = getDHMap(attachments); mc.put(propertyName,