svn commit: r1231217 - in /cxf/branches/2.5.x-fixes: ./ rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java

[dkulp]

Author: dkulp
Date: Fri Jan 13 18:14:55 2012
New Revision: 1231217

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

........
  r1227823 | dkulp | 2012-01-05 15:46:10 -0500 (Thu, 05 Jan 2012) | 2 lines
  
  [CXF-3989] Recorded scopes are "mapped" keys, make sure we map the key
  when setting and getting the scope
........

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

Propchange: cxf/branches/2.5.x-fixes/
            ('svn:mergeinfo' removed)

Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Jan 13 18:14:55 2012
@@ -1 +1 @@
-/cxf/trunk:1-1227739,1229663,1229965,1230800
+/cxf/trunk:1-1227739,1227823,1229663,1229965,1230800

Modified: 
cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java?rev=1231217&r1=1231216&r2=1231217&view=diff
==============================================================================
--- 
cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java
 (original)
+++ 
cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java
 Fri Jan 13 18:14:55 2012
@@ -484,19 +484,20 @@ public class WrappedMessageContext imple
     }
 
     public final void setScope(String key, Scope arg1) {
-        if (!this.containsKey(key) && !scopes.containsKey(key)) {
+        String mappedKey = mapKey(key);
+        if (!this.containsKey(mappedKey) && !scopes.containsKey(mappedKey)) {
             throw new IllegalArgumentException("non-existant property-" + key 
+ "is specified");    
         }
-        scopes.put(key, arg1);        
+        scopes.put(mappedKey, arg1);        
     }
 
     public final Scope getScope(String key) {
-        if (containsKey(key)) {
-            if (scopes.containsKey(key)) {
-                return scopes.get(key);
-            } else {
-                return defaultScope;
-            }
+        String mappedKey = mapKey(key);
+        if (scopes.containsKey(mappedKey)) {
+            return scopes.get(mappedKey);
+        }
+        if (containsKey(mappedKey)) {
+            return defaultScope;
         }
         throw new IllegalArgumentException("non-existant property-" + key + 
"is specified");
     }