cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r700141 - in /cxf/branches/2.1.x-fixes: ./ rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java
Date Mon, 29 Sep 2008 14:43:46 GMT
Author: gawor
Date: Mon Sep 29 07:43:45 2008
New Revision: 700141

URL: http://svn.apache.org/viewvc?rev=700141&view=rev
Log:
Merged revisions 700139 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r700139 | gawor | 2008-09-29 10:39:37 -0400 (Mon, 29 Sep 2008) | 1 line
  
  check for null
........

Modified:
    cxf/branches/2.1.x-fixes/   (props changed)
    cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java?rev=700141&r1=700140&r2=700141&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java
(original)
+++ cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java
Mon Sep 29 07:43:45 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<String, Scope>();



Mime
View raw message