[weld-commits] Weld SVN: r6295 - cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ejb.

[weld-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2010-05-24 12:07:29 -0400 (Mon, 24 May 2010)
New Revision: 6295

Modified:
   cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ejb/FMSModelIII.java
Log:
CDITCK-155, CDITCK-157

Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ejb/FMSModelIII.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ejb/FMSModelIII.java	2010-05-24 15:46:59 UTC (rev 6294)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ejb/FMSModelIII.java	2010-05-24 16:07:29 UTC (rev 6295)
@@ -42,12 +42,12 @@
    
    @Inject Instance<SimpleRequestBean> simpleRequestBean;
 
-   private static boolean requestScopeActive = false;
-   private static double beanId = 0.0d;
-   private static boolean sameBean = false;
+   private static volatile boolean requestScopeActive = false;
+   private static volatile double beanId = 0.0d;
+   private static volatile boolean sameBean = false;
    
-   private static boolean climbed;
-   private static boolean descended;
+   private static volatile boolean climbed;
+   private static volatile boolean descended;
 
    public void climb()
    {
@@ -57,9 +57,6 @@
    public void descend()
    {
       timerService.createTimer(100, DESCEND_COMMAND);
-      // Resets
-      beanId = 0.0d;
-      sameBean = false;
    }
 
    @Timeout