Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-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 AF70271B4 for ; Wed, 14 Sep 2011 17:50:08 +0000 (UTC) Received: (qmail 35948 invoked by uid 500); 14 Sep 2011 17:50:08 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 35903 invoked by uid 500); 14 Sep 2011 17:50:08 -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 35895 invoked by uid 99); 14 Sep 2011 17:50:08 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 Sep 2011 17:50:08 +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, 14 Sep 2011 17:50:07 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 6790C238890A for ; Wed, 14 Sep 2011 17:49:47 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1170734 - in /cxf/branches/2.4.x-fixes: ./ rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java Date: Wed, 14 Sep 2011 17:49:47 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110914174947.6790C238890A@eris.apache.org> Author: dkulp Date: Wed Sep 14 17:49:46 2011 New Revision: 1170734 URL: http://svn.apache.org/viewvc?rev=1170734&view=rev Log: Merged revisions 1170729 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1170729 | dkulp | 2011-09-14 13:43:39 -0400 (Wed, 14 Sep 2011) | 2 lines [CXF-3802] Easier override of addressing properties from service Patch tested by Jesse Pangburn ........ Modified: cxf/branches/2.4.x-fixes/ (props changed) cxf/branches/2.4.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.4.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java?rev=1170734&r1=1170733&r2=1170734&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java (original) +++ cxf/branches/2.4.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java Wed Sep 14 17:49:46 2011 @@ -277,8 +277,14 @@ public final class ContextUtils { LOG.log(Level.FINE, "retrieving MAPs from context property {0}", mapProperty); + AddressingPropertiesImpl maps = (AddressingPropertiesImpl)message.get(mapProperty); + if (maps == null && isOutbound && !isRequestor + && message.getExchange() != null && message.getExchange().getInMessage() != null) { + maps = (AddressingPropertiesImpl)message.getExchange().getInMessage().get(mapProperty); + } + if (maps != null) { LOG.log(Level.FINE, "current MAPs {0}", maps); } else if (!isProviderContext) {