svn commit: r651796 - in /incubator/tuscany/java/sca: itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java

[js...@apache.org]

Author: jsdelfino
Date: Fri Apr 25 20:00:36 2008
New Revision: 651796

URL: http://svn.apache.org/viewvc?rev=651796&view=rev
Log:
A real fix for the addressinuse issue in the itest/oneway integration test. The problem was that node.stop() was not calling runtime.stop() so the jetty server was not stopped after the invocation of the test method, and still holding port 8085 when the second node was trying to bind to it.

Modified:
    incubator/tuscany/java/sca/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java
    incubator/tuscany/java/sca/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java

Modified: incubator/tuscany/java/sca/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java?rev=651796&r1=651795&r2=651796&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java (original)
+++ incubator/tuscany/java/sca/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java Fri Apr 25 20:00:36 2008
@@ -35,7 +35,9 @@
 import org.apache.tuscany.sca.node.SCANode2;
 import org.apache.tuscany.sca.node.SCANode2Factory;
 import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
+import org.junit.After;
 import org.junit.AfterClass;
+import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -51,15 +53,15 @@
      */
     private static final int MAX_SLEEP_TIME = 10000;
 
-    private static SCANode2 node;
+    private SCANode2 node;
     
     /**
      * Initialise the SCADomain.
      *
      * @throws Exception Failed to initialise the SCADomain
      */
-    @BeforeClass
-    public static void setUp() throws Exception {
+    @Before
+    public void setUp() throws Exception {
         
         SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
         node = nodeFactory.createSCANode(new File("src/main/resources/OneWayContribution/META-INF/sca-deployables/oneWay.composite").toURL().toString(),
@@ -76,8 +78,8 @@
      *
      * @throws Exception Failed to shutdown the SCADomain
      */
-    @AfterClass
-    public static void tearDown() throws Exception {
+    @After
+    public void tearDown() throws Exception {
         node.stop();
     }
 

Modified: incubator/tuscany/java/sca/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java?rev=651796&r1=651795&r2=651796&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java (original)
+++ incubator/tuscany/java/sca/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java Fri Apr 25 20:00:36 2008
@@ -327,6 +327,9 @@
             // Deactivate the composite
             compositeActivator.deactivate(composite);
             
+            // Stop the runtime
+            runtime.stop();
+            
         } catch (ActivationException e) {
             throw new ServiceRuntimeException(e);
         }