svn commit: r1074123 - in /openwebbeans/trunk: webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/ webbeans-impl/src/main/java/org/apache/webbeans/util/ webbeans-jms/src/main/java/org/apache/webbeans/jms/util/ webbeans-porting/src/main/java/or...

Thu, 24 Feb 2011 04:24:10 -0800 

Author: struberg
Date: Thu Feb 24 12:23:40 2011
New Revision: 1074123

URL: http://svn.apache.org/viewvc?rev=1074123&view=rev
Log:
OWB-529 fix concurrency problems

Modified:
    
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointFactory.java
    
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java
    
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
    
openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/util/JmsProxyHandler.java
    
openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/ManagersImpl.java

Modified: 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointFactory.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointFactory.java?rev=1074123&r1=1074122&r2=1074123&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointFactory.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointFactory.java
 Thu Feb 24 12:23:40 2011
@@ -217,22 +217,6 @@ public class InjectionPointFactory
         return lists;
     }
 
-
-
-    private static boolean checkMethodApplicable(Annotation[] annot)
-    {
-        for (Annotation observersAnnot : annot)
-        {
-            if (observersAnnot.annotationType().equals(Observes.class))
-            {
-                return true;
-            }
-        }
-
-        return false;
-
-    }
-
     public static InjectionPoint getPartialInjectionPoint(Bean<?> owner,Type 
type, Member member, Annotated annotated, Annotation...bindings)
     {
         InjectionPointImpl impl = new 
InjectionPointImpl(owner,type,member,annotated);

Modified: 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java?rev=1074123&r1=1074122&r2=1074123&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java
 Thu Feb 24 12:23:40 2011
@@ -579,7 +579,7 @@ public final class ClassUtil
 
         return objectMethodNames;
     }
-    private static List objectMethodNames= null;
+    private static volatile List objectMethodNames= null;
     
 
 

Modified: 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java?rev=1074123&r1=1074122&r2=1074123&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
 Thu Feb 24 12:23:40 2011
@@ -180,7 +180,7 @@ public final class WebBeansUtil
      * Enforcing that interceptor callbacks should not be
      * able to throw checked exceptions is configurable
      */
-    private static Boolean enforceCheckedException;
+    private static volatile Boolean enforceCheckedException;
 
     private final WebBeansContext webBeansContext;
 

Modified: 
openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/util/JmsProxyHandler.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/util/JmsProxyHandler.java?rev=1074123&r1=1074122&r2=1074123&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/util/JmsProxyHandler.java
 (original)
+++ 
openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/util/JmsProxyHandler.java
 Thu Feb 24 12:23:40 2011
@@ -48,7 +48,7 @@ public class JmsProxyHandler implements 
 {
     private JmsBean<?> jmsComponent = null;
 
-    private static ConnectionFactory connectionFactory = null;
+    private static volatile ConnectionFactory connectionFactory = null;
 
     private AtomicBoolean cfSet = new AtomicBoolean(false);
 

Modified: 
openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/ManagersImpl.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/ManagersImpl.java?rev=1074123&r1=1074122&r2=1074123&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/ManagersImpl.java
 (original)
+++ 
openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/ManagersImpl.java
 Thu Feb 24 12:23:40 2011
@@ -27,7 +27,7 @@ import org.jboss.testharness.api.Deploym
 
 public class ManagersImpl implements Managers
 {
-    private static InjectableBeanManager beanManager;
+    private static volatile InjectableBeanManager beanManager;
     
     public static void cleanUp()
     {

Reply via email to