axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sc...@apache.org
Subject svn commit: r685534 - /webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/handler/MEPContext.java
Date Wed, 13 Aug 2008 13:16:16 GMT
Author: scheu
Date: Wed Aug 13 06:16:15 2008
New Revision: 685534

URL: http://svn.apache.org/viewvc?rev=685534&view=rev
Log:
Quick Change
Adding synchronized access to the request MC in the MEP.
We encountered a situation where a 2 MEPS for different response MC's have the same request
MC.
This caused the code to encounter a ConcurrentModificationException.
The new sync code should avoid the CME, and should not affect performance.

Modified:
    webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/handler/MEPContext.java

Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/handler/MEPContext.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/handler/MEPContext.java?rev=685534&r1=685533&r2=685534&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/handler/MEPContext.java
(original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/handler/MEPContext.java
Wed Aug 13 06:16:15 2008
@@ -42,6 +42,10 @@
  */
 public class MEPContext implements javax.xml.ws.handler.MessageContext {
 
+    // If this a request flow, then the MEP contains the request MC.
+    // If this a response flow, then the MEP contains both the request MC and the response
MC.
+    // (Note that access to the requestMC properties is sometimes synchronized in the
+    // response flow.)
     protected MessageContext requestMC;
     protected MessageContext responseMC;
     
@@ -154,22 +158,26 @@
         if (responseMC != null) {
             responseMC.getProperties().clear();
         }
-        requestMC.getProperties().clear();
+        synchronized (requestMC) {
+            requestMC.getProperties().clear();
+        }
     }
 
     public boolean containsKey(Object key) {
         if (isApplicationAccessLocked()) {
             return getApplicationScopedProperties().containsKey(key);
         }
-        if (responseMC != null) {
-            boolean containsKey = responseMC.containsKey(key) || requestMC.containsKey(key);
+        synchronized (requestMC) {
+            if (responseMC != null) {
+                boolean containsKey = responseMC.containsKey(key) || requestMC.containsKey(key);
+                if ((getScope((String)key) == Scope.APPLICATION) || (!isApplicationAccessLocked()))
{
+                    return containsKey;
+                }
+            }
             if ((getScope((String)key) == Scope.APPLICATION) || (!isApplicationAccessLocked()))
{
-                return containsKey;
+                return requestMC.containsKey(key);
             }
         }
-        if ((getScope((String)key) == Scope.APPLICATION) || (!isApplicationAccessLocked()))
{
-            return requestMC.containsKey(key);
-        }
         return false;
     }
 
@@ -178,7 +186,13 @@
             return getApplicationScopedProperties().containsValue(value);
         }
         if (responseMC != null) {
-            return responseMC.getProperties().containsValue(value) || requestMC.getProperties().containsValue(value);
+
+            if (responseMC.getProperties().containsValue(value)) {
+                return true; 
+            }
+            synchronized (requestMC) {
+                return requestMC.getProperties().containsValue(value);
+            }
         }
         return requestMC.getProperties().containsValue(value);
     }
@@ -190,7 +204,10 @@
             return getApplicationScopedProperties().entrySet();
         }
         HashMap tempProps = new HashMap();
-        tempProps.putAll(requestMC.getProperties());
+        
+        synchronized (requestMC) {
+            tempProps.putAll(requestMC.getProperties());
+        }
         if (responseMC != null) {
             tempProps.putAll(responseMC.getProperties());
         }
@@ -206,8 +223,10 @@
                 }
             }
         }
-        if ((getScope((String)key) == Scope.APPLICATION) || (!isApplicationAccessLocked()))
{
-            return requestMC.getProperty(key);
+        synchronized (requestMC) {
+            if ((getScope((String)key) == Scope.APPLICATION) || (!isApplicationAccessLocked()))
{
+                return requestMC.getProperty(key);
+            }
         }
         return null;
     }
@@ -216,10 +235,12 @@
         if (isApplicationAccessLocked()) {
             return getApplicationScopedProperties().isEmpty();
         }
-        if (responseMC != null) {
-            return requestMC.getProperties().isEmpty() && requestMC.getProperties().isEmpty();
+        synchronized (requestMC) {
+            if (responseMC != null) {
+                return requestMC.getProperties().isEmpty() && requestMC.getProperties().isEmpty();
+            }
+            return requestMC.getProperties().isEmpty();
         }
-        return requestMC.getProperties().isEmpty();
     }
 
     public Set keySet() {
@@ -227,7 +248,9 @@
             return getApplicationScopedProperties().keySet();
         }
         HashMap tempProps = new HashMap();
-        tempProps.putAll(requestMC.getProperties());
+        synchronized (requestMC) {
+            tempProps.putAll(requestMC.getProperties());
+        }
         if (responseMC != null) {
             tempProps.putAll(responseMC.getProperties());
         }
@@ -241,13 +264,15 @@
         if (scopes.get(key) == null) {  // check the scopes object directly, not through
getScope()!!
             setScope(key, Scope.HANDLER);
         }
-        if (requestMC.containsKey(key)) {
+        synchronized (requestMC) {
+            if (requestMC.containsKey(key)) {
+                return requestMC.setProperty(key, value);
+            }
+            if (responseMC != null) {
+                return responseMC.setProperty(key, value);
+            }
             return requestMC.setProperty(key, value);
         }
-        if (responseMC != null) {
-            return responseMC.setProperty(key, value);
-        }
-        return requestMC.setProperty(key, value);
     }
 
     public void putAll(Map t) {
@@ -262,7 +287,9 @@
             responseMC.setProperties(t);
         }
         else {
-            requestMC.setProperties(t);
+            synchronized (requestMC) {
+                requestMC.setProperties(t);
+            }
         }
     }
 
@@ -280,11 +307,13 @@
         if (responseMC != null) {
             retVal = responseMC.getProperties().remove(key);
         }
-        if (retVal == null) {
-            return requestMC.getProperties().remove(key);
-        }
-        else {
-            requestMC.getProperties().remove(key);
+        synchronized (requestMC) {
+            if (retVal == null) {
+                return requestMC.getProperties().remove(key);
+            }
+            else {
+                requestMC.getProperties().remove(key);
+            }
         }
         return retVal;
     }
@@ -297,7 +326,9 @@
         // The properties must be combined together because some
         // keys may be the same on the request and the response.
         HashMap tempProps = new HashMap();
-        tempProps.putAll(requestMC.getProperties());
+        synchronized (requestMC) {
+            tempProps.putAll(requestMC.getProperties());
+        }
         if (responseMC != null) {
             tempProps.putAll(responseMC.getProperties());
         }
@@ -309,7 +340,9 @@
             return getApplicationScopedProperties().values();
         }
         HashMap tempProps = new HashMap();
-        tempProps.putAll(requestMC.getProperties());
+        synchronized (requestMC) {
+            tempProps.putAll(requestMC.getProperties());
+        }
         if (responseMC != null) {
             tempProps.putAll(responseMC.getProperties());
         }
@@ -361,10 +394,12 @@
         if (!scopes.containsValue(Scope.APPLICATION)) {
             return tempMap;
         }
-        for(Iterator it = requestMC.getProperties().entrySet().iterator(); it.hasNext();)
{
-            Entry entry = (Entry)it.next();
-            if (getScope((String)entry.getKey()).equals(Scope.APPLICATION)) {
-                tempMap.put((String)entry.getKey(), entry.getValue());
+        synchronized (requestMC) {
+            for(Iterator it = requestMC.getProperties().entrySet().iterator(); it.hasNext();)
{
+                Entry entry = (Entry)it.next();
+                if (getScope((String)entry.getKey()).equals(Scope.APPLICATION)) {
+                    tempMap.put((String)entry.getKey(), entry.getValue());
+                }
             }
         }
         if (responseMC != null) {



Mime
View raw message