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 6B2C09E40 for ; Thu, 5 Jan 2012 05:33:24 +0000 (UTC) Received: (qmail 64521 invoked by uid 500); 5 Jan 2012 05:33:21 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 64386 invoked by uid 500); 5 Jan 2012 05:33:11 -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 64377 invoked by uid 99); 5 Jan 2012 05:33:09 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Jan 2012 05:33:09 +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; Thu, 05 Jan 2012 05:33:06 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 63713238890B for ; Thu, 5 Jan 2012 05:32:46 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1227490 - in /cxf/trunk/rt/frontend/jaxws/src: main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java test/java/org/apache/cxf/jaxws/context/WebServiceContextImplTest.java Date: Thu, 05 Jan 2012 05:32:46 -0000 To: commits@cxf.apache.org From: ema@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120105053246.63713238890B@eris.apache.org> Author: ema Date: Thu Jan 5 05:32:45 2012 New Revision: 1227490 URL: http://svn.apache.org/viewvc?rev=1227490&view=rev Log: [CXF-3989]:messageConetxt.setScope(MessageContext.HTTP_REQUEST_HEADERS, Scope.APPLICATION) leads to java.lang.IllegalArgumentException Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WebServiceContextImplTest.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=1227490&r1=1227489&r2=1227490&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 Thu Jan 5 05:32:45 2012 @@ -484,7 +484,7 @@ public class WrappedMessageContext imple } public final void setScope(String key, Scope arg1) { - if (!this.containsKey(key)) { + if (!this.containsKey(key) && !scopes.containsKey(key)) { throw new IllegalArgumentException("non-existant property-" + key + "is specified"); } scopes.put(key, arg1); Modified: cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WebServiceContextImplTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WebServiceContextImplTest.java?rev=1227490&r1=1227489&r2=1227490&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WebServiceContextImplTest.java (original) +++ cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WebServiceContextImplTest.java Thu Jan 5 05:32:45 2012 @@ -21,7 +21,13 @@ package org.apache.cxf.jaxws.context; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import javax.xml.ws.handler.MessageContext; +import javax.xml.ws.handler.MessageContext.Scope; import org.apache.cxf.message.MessageImpl; import org.junit.After; @@ -71,5 +77,19 @@ public class WebServiceContextImplTest e } catch (InterruptedException e) { e.printStackTrace(); } - } + } + + // CXF-3989 + @Test + @SuppressWarnings("unchecked") + public void testSetHttpRequestHeadersScope() { + MessageImpl msg = new MessageImpl(); + MessageContext context = new WrappedMessageContext(msg); + Map headers = new HashMap>(); + List values = new ArrayList(); + values.add("Value1"); + headers.put("Header1", values); + context.put(MessageContext.HTTP_REQUEST_HEADERS, headers); + context.setScope(MessageContext.HTTP_REQUEST_HEADERS, Scope.APPLICATION); + } }