svn commit: r799637 - /cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java

[dkulp]

Author: dkulp
Date: Fri Jul 31 15:32:34 2009
New Revision: 799637

URL: http://svn.apache.org/viewvc?rev=799637&view=rev
Log:
Remove a static map that held onto things strongly.  Wasn't needed.

Modified:
    
cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java

Modified: 
cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java?rev=799637&r1=799636&r2=799637&view=diff
==============================================================================
--- 
cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java
 (original)
+++ 
cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java
 Fri Jul 31 15:32:34 2009
@@ -20,7 +20,6 @@
 package org.apache.cxf.ws.addressing;
 
 
-import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.Executor;
 import java.util.logging.Level;
@@ -35,7 +34,6 @@
 import org.apache.cxf.binding.soap.SoapBindingConstants;
 import org.apache.cxf.binding.soap.model.SoapOperationInfo;
 import org.apache.cxf.common.logging.LogUtils;
-import org.apache.cxf.common.util.TwoStageMap;
 import org.apache.cxf.endpoint.ConduitSelector;
 import org.apache.cxf.endpoint.Endpoint;
 import org.apache.cxf.endpoint.NullConduitSelector;
@@ -77,11 +75,9 @@
 
     private static final EndpointReferenceType NONE_ENDPOINT_REFERENCE = 
         EndpointReferenceUtils.getEndpointReference(Names.WSA_NONE_ADDRESS);
-    private static final Map<MessageInfo, String> ACTION_MAP =
-        new TwoStageMap<MessageInfo, String>();
     
     private static final Logger LOG = 
LogUtils.getL7dLogger(ContextUtils.class);
-    
+    private static final String ACTION = ContextUtils.class.getName() + 
".ACTION";
     
     /**
      * Used to fabricate a Uniform Resource Name from a UUID string
@@ -737,7 +733,7 @@
                         ContextUtils.isRequestor(message)
                         ? bindingOpInfo.getOperationInfo().getInput()
                         : bindingOpInfo.getOperationInfo().getOutput();
-                    String cachedAction = ACTION_MAP.get(msgInfo);
+                    String cachedAction = (String)msgInfo.getProperty(ACTION);
                     if (cachedAction == null) {
                         action = getActionFromMessageAttributes(msgInfo);
                     } else {
@@ -789,7 +785,7 @@
             String attr = getAction(msgInfo);
             if (attr != null) {
                 action = attr;
-                ACTION_MAP.put(msgInfo, action);
+                msgInfo.setProperty(ACTION, action);
             }
         }
         return action;