[jboss-cvs] JBossAS SVN: r67077 - projects/test/trunk/src/main/java/org/jboss/test/util/server.

[jboss-cvs-commits at lists.jboss.org]

Author: mvecera at redhat.com
Date: 2007-11-14 11:44:16 -0500 (Wed, 14 Nov 2007)
New Revision: 67077

Modified:
   projects/test/trunk/src/main/java/org/jboss/test/util/server/ServerController.java
Log:
JBAS-2235 ServerController.stopServer() throws ServerShutdownException when the server cannot be shutdown properly within the timeout period

Modified: projects/test/trunk/src/main/java/org/jboss/test/util/server/ServerController.java
===================================================================
--- projects/test/trunk/src/main/java/org/jboss/test/util/server/ServerController.java	2007-11-14 16:22:41 UTC (rev 67076)
+++ projects/test/trunk/src/main/java/org/jboss/test/util/server/ServerController.java	2007-11-14 16:44:16 UTC (rev 67077)
@@ -263,6 +263,8 @@
     */
    public static void stopServer(Server server, ServerManager manager) throws IOException
    {
+		boolean cleanShutdown = true;
+		
       if (!server.isRunning())
       {
          throw new IllegalArgumentException("The " + server.getName() + " is not running; it cannot be stopped.");
@@ -281,6 +283,7 @@
          System.err.println("Failed to shutdown server \"" + server.getName()
                + "\" before timeout. Destroying the process.");
          process.destroy();
+			cleanShutdown = false;
       }
 
       closeAllStreams(process);
@@ -295,6 +298,11 @@
       catch (InterruptedException e)
       {
       }
+		
+		if (!cleanShutdown)
+		{
+			throw new ServerShutdownException("Failed to shutdown server before timeout. Process was destroyed.");
+		}
    }
 
    /**