You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by da...@apache.org on 2006/12/18 07:16:45 UTC

svn commit: r488133 - /incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/TestManager.java

Author: dain
Date: Sun Dec 17 22:16:44 2006
New Revision: 488133

URL: http://svn.apache.org/viewvc?view=rev&rev=488133
Log:
The database must be stopped before the server is shutdown.  Otherwise the database bean is unavailable.

Modified:
    incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/TestManager.java

Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/TestManager.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/TestManager.java?view=diff&rev=488133&r1=488132&r2=488133
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/TestManager.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/TestManager.java Sun Dec 17 22:16:44 2006
@@ -82,19 +82,19 @@
 
     public static void stop() throws Exception{
         try{
-            if (server != null) {
-                server.stop();
+            if (database != null) {
+                database.stop();
             }
         } catch (Exception e){
-            if (warn) System.out.println("Cannot stop the test server 2: "+e.getClass().getName()+" "+e.getMessage());
+            if (warn) System.out.println("Cannot stop the test database: "+e.getClass().getName()+" "+e.getMessage());
             throw e;
         }
         try{
-            if (database != null) {
-                database.stop();
+            if (server != null) {
+                server.stop();
             }
         } catch (Exception e){
-            if (warn) System.out.println("Cannot stop the test database: "+e.getClass().getName()+" "+e.getMessage());
+            if (warn) System.out.println("Cannot stop the test server 2: "+e.getClass().getName()+" "+e.getMessage());
             throw e;
         }
     }