svn commit: r1079024 - /openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java

[struberg]

Author: struberg
Date: Mon Mar  7 23:36:47 2011
New Revision: 1079024

URL: http://svn.apache.org/viewvc?rev=1079024&view=rev
Log:
OWB-530 remove superfluous synchronized blocks

Modified:
    
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java

Modified: 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java?rev=1079024&r1=1079023&r2=1079024&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java
 Mon Mar  7 23:36:47 2011
@@ -208,22 +208,19 @@ public class CreationalContextImpl<T> im
             return null;
         }
 
-        synchronized(this)
+        List<DependentCreationalContext<?>> values = 
this.dependentObjects.get(ownerInstance);
+        if(values != null && !values.isEmpty())
         {
-            List<DependentCreationalContext<?>> values = 
this.dependentObjects.get(ownerInstance);
-            if(values != null && !values.isEmpty())
+            Iterator<DependentCreationalContext<?>> it = values.iterator();
+            while(it.hasNext())
             {
-                Iterator<DependentCreationalContext<?>> it = values.iterator();
-                while(it.hasNext())
+                DependentCreationalContext<?> dc = it.next();
+                if(dc.getDependentType().equals(DependentType.INTERCEPTOR) &&
+                   dc.getContextual().equals(interceptor))
                 {
-                    DependentCreationalContext<?> dc = it.next();
-                    if(dc.getDependentType().equals(DependentType.INTERCEPTOR) 
&&
-                       dc.getContextual().equals(interceptor))
-                    {
-                        return dc.getInstance();
-                    }
-
+                    return dc.getInstance();
                 }
+
             }
         }
 
@@ -244,24 +241,22 @@ public class CreationalContextImpl<T> im
             return null;
         }
 
-        synchronized(this)
+        List<DependentCreationalContext<?>> values = 
this.dependentObjects.get(ownerInstance);
+        if (values != null && values.size() > 0)
         {
-            List<DependentCreationalContext<?>> values = 
this.dependentObjects.get(ownerInstance);
-            if (values != null && values.size() > 0)
+            Iterator<DependentCreationalContext<?>> it = values.iterator();
+            while (it.hasNext())
             {
-                Iterator<DependentCreationalContext<?>> it = values.iterator();
-                while (it.hasNext())
-                {
-                    DependentCreationalContext<?> dc = it.next();
+                DependentCreationalContext<?> dc = it.next();
 
-                    if(dc.getDependentType().equals(DependentType.DECORATOR) &&
-                       dc.getContextual().equals(decorator))
-                    {
-                        return dc.getInstance();
-                    }
+                if(dc.getDependentType().equals(DependentType.DECORATOR) &&
+                   dc.getContextual().equals(decorator))
+                {
+                    return dc.getInstance();
                 }
             }
         }
+
         return null;
     }
 
@@ -275,7 +270,7 @@ public class CreationalContextImpl<T> im
         
         destroying = true;
 
-        synchronized(this)
+        //X synchronized(this)
         {
             Collection<List<DependentCreationalContext<?>>> values = 
this.dependentObjects.values();
             if(values != null)