Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 74833 invoked from network); 29 Sep 2008 14:40:29 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 29 Sep 2008 14:40:29 -0000 Received: (qmail 44321 invoked by uid 500); 29 Sep 2008 14:40:28 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 44274 invoked by uid 500); 29 Sep 2008 14:40:27 -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 44265 invoked by uid 99); 29 Sep 2008 14:40:27 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Sep 2008 07:40:27 -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; Mon, 29 Sep 2008 14:39:34 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1387723889B9; Mon, 29 Sep 2008 07:39:38 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r700139 - /cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java Date: Mon, 29 Sep 2008 14:39:37 -0000 To: commits@cxf.apache.org From: gawor@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080929143938.1387723889B9@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gawor Date: Mon Sep 29 07:39:37 2008 New Revision: 700139 URL: http://svn.apache.org/viewvc?rev=700139&view=rev Log: check for null 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=700139&r1=700138&r2=700139&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 Mon Sep 29 07:39:37 2008 @@ -122,8 +122,10 @@ if (scopes == null && reqMessage != null) { scopes = CastUtils.cast((Map)reqMessage.get(SCOPES)); - m.put(SCOPES, scopes); - copyScoped(reqMessage); + if (scopes != null) { + m.put(SCOPES, scopes); + copyScoped(reqMessage); + } } if (scopes == null) { scopes = new HashMap();