svn commit: r1210338 - in /synapse/trunk/java/modules/core/src/main/java/org/apache/synapse: config/Entry.java endpoints/ResolvingEndpoint.java

[ra...@apache.org]

Author: rajikak
Date: Mon Dec  5 06:17:50 2011
New Revision: 1210338

URL: http://svn.apache.org/viewvc?rev=1210338&view=rev
Log:
Synchronized the endpoint init. in order to avoid double locking.

Modified:
    synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/Entry.java
    synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/ResolvingEndpoint.java

Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/Entry.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/Entry.java?rev=1210338&r1=1210337&r2=1210338&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/Entry.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/Entry.java Mon Dec  5 06:17:50 2011
@@ -117,11 +117,11 @@ public class Entry implements SynapseArt
      * OMElement otherwise.
      * @return Either an OMElement or a String
      */
-    public synchronized Object getValue() {
+    public Object getValue() {
         return value;
     }
 
-    public synchronized void setValue(Object value) {
+    public void setValue(Object value) {
         this.value = value;
     }
 
@@ -129,7 +129,7 @@ public class Entry implements SynapseArt
      *
      * @return mapper
      */
-    public synchronized XMLToObjectMapper getMapper() {
+    public XMLToObjectMapper getMapper() {
         return mapper;
     }
 
@@ -138,7 +138,7 @@ public class Entry implements SynapseArt
      *
      * @param mapper XMLToObjectMapper instance
      */
-    public synchronized void setMapper(XMLToObjectMapper mapper) {
+    public void setMapper(XMLToObjectMapper mapper) {
         this.mapper = mapper;
     }
 

Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/ResolvingEndpoint.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/ResolvingEndpoint.java?rev=1210338&r1=1210337&r2=1210338&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/ResolvingEndpoint.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/ResolvingEndpoint.java Mon Dec  5 06:17:50 2011
@@ -53,7 +53,7 @@ public class ResolvingEndpoint extends A
         }
     }
 
-    private synchronized Endpoint loadAndInitEndpoint(ConfigurationContext cc, String key) {
+    private Endpoint loadAndInitEndpoint(ConfigurationContext cc, String key) {
         Parameter parameter = cc.getAxisConfiguration().getParameter(
                 SynapseConstants.SYNAPSE_CONFIG);
         Parameter synEnvParameter = cc.getAxisConfiguration().getParameter(
@@ -70,7 +70,9 @@ public class ResolvingEndpoint extends A
 
             Endpoint ep = synCfg.getEndpoint(key);
             if (ep != null && !ep.isInitialized()) {
-                ep.init(synapseEnvironment);
+                synchronized (ep) {
+                    ep.init(synapseEnvironment);
+                }
             }
             return ep;
         }