You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jm...@apache.org on 2006/02/12 05:25:22 UTC
svn commit: r377127 - in /incubator/tuscany/java/sca/core/src:
main/java/org/apache/tuscany/core/context/impl/
main/java/org/apache/tuscany/core/system/context/
test/java/org/apache/tuscany/core/runtime/
Author: jmarino
Date: Sat Feb 11 20:25:22 2006
New Revision: 377127
URL: http://svn.apache.org/viewcvs?rev=377127&view=rev
Log:
fix for TUSCANY-24: restart of runtime context
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractAggregateContext.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemAggregateContextImpl.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/runtime/RuntimeBootTestCase.java
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractAggregateContext.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractAggregateContext.java?rev=377127&r1=377126&r2=377127&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractAggregateContext.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractAggregateContext.java Sat Feb 11 20:25:22 2006
@@ -134,7 +134,7 @@
public void start() {
synchronized (initializeLatch) {
try {
- if (lifecycleState != UNINITIALIZED) {
+ if (lifecycleState != UNINITIALIZED && lifecycleState != STOPPED) {
throw new IllegalStateException("Context not in UNINITIALIZED state");
}
lifecycleState = INITIALIZING;
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemAggregateContextImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemAggregateContextImpl.java?rev=377127&r1=377126&r2=377127&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemAggregateContextImpl.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemAggregateContextImpl.java Sat Feb 11 20:25:22 2006
@@ -164,7 +164,7 @@
public void start() {
synchronized (initializeLatch) {
try {
- if(lifecycleState != UNINITIALIZED){
+ if(lifecycleState != UNINITIALIZED && lifecycleState != STOPPED){
throw new IllegalStateException("Context not in UNINITIALIZED state");
}
Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/runtime/RuntimeBootTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/runtime/RuntimeBootTestCase.java?rev=377127&r1=377126&r2=377127&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/runtime/RuntimeBootTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/runtime/RuntimeBootTestCase.java Sat Feb 11 20:25:22 2006
@@ -50,7 +50,7 @@
}
public void testRuntimeLifecycle() {
-/* fails as system context has already been initialized
+// fails as system context has already been initialized
assertEquals(Context.RUNNING, runtime.getLifecycleState());
runtime.stop();
@@ -58,7 +58,7 @@
runtime.start();
assertEquals(Context.RUNNING, runtime.getLifecycleState());
-*/
+//
}
public void testIncrementalBoot() throws Exception{