svn commit: r700139 - /cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java

[gawor]

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<String, Scope>();