svn commit: r667049 - in /incubator/tuscany/java/sca/vtest/java-api/annotations/scope/src: main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/ test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/

[antelder]

Author: antelder
Date: Thu Jun 12 04:41:08 2008
New Revision: 667049

URL: http://svn.apache.org/viewvc?rev=667049&view=rev
Log:
TUSCANY-2274: fix intermitent scope vtests failures by synchronizing 
IServiceImpl currentInstanceId initilization

Modified:
    
incubator/tuscany/java/sca/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/IServiceImpl.java
    
incubator/tuscany/java/sca/vtest/java-api/annotations/scope/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/ScopeAnnotationTestCase.java

Modified: 
incubator/tuscany/java/sca/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/IServiceImpl.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/IServiceImpl.java?rev=667049&r1=667048&r2=667049&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/IServiceImpl.java
 (original)
+++ 
incubator/tuscany/java/sca/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/IServiceImpl.java
 Thu Jun 12 04:41:08 2008
@@ -53,7 +53,9 @@
        public boolean isInitReady = false;
        
        public IServiceImpl() {
-               currentInstanceId = ++instanceCounter;
+               synchronized (IServiceImpl.class) {
+                       currentInstanceId = ++instanceCounter;
+               }
                isInitReady = false;
        }
 

Modified: 
incubator/tuscany/java/sca/vtest/java-api/annotations/scope/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/ScopeAnnotationTestCase.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/java-api/annotations/scope/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/ScopeAnnotationTestCase.java?rev=667049&r1=667048&r2=667049&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/vtest/java-api/annotations/scope/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/ScopeAnnotationTestCase.java
 (original)
+++ 
incubator/tuscany/java/sca/vtest/java-api/annotations/scope/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/ScopeAnnotationTestCase.java
 Thu Jun 12 04:41:08 2008
@@ -83,7 +83,6 @@
      * CComponent is defined '@Scope("STATELESS")'<br>
      * <p>
      */
-    @Ignore ("TUSCANY-2274")
     @Test
     public void atScope1() throws Exception {
         System.out.println("atScope1");