[jboss-cvs] JBossAS SVN: r67076 - projects/test/trunk/src/main/java/org/jboss/ant/taskdefs/server.

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

Author: mvecera at redhat.com
Date: 2007-11-14 11:22:41 -0500 (Wed, 14 Nov 2007)
New Revision: 67076

Modified:
   projects/test/trunk/src/main/java/org/jboss/ant/taskdefs/server/StopServerTask.java
Log:
JBAS-2235 handling ServerShutdownException (logging error), fixed BuildException message

Modified: projects/test/trunk/src/main/java/org/jboss/ant/taskdefs/server/StopServerTask.java
===================================================================
--- projects/test/trunk/src/main/java/org/jboss/ant/taskdefs/server/StopServerTask.java	2007-11-14 15:42:56 UTC (rev 67075)
+++ projects/test/trunk/src/main/java/org/jboss/ant/taskdefs/server/StopServerTask.java	2007-11-14 16:22:41 UTC (rev 67076)
@@ -25,7 +25,9 @@
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Task;
+import org.apache.tools.ant.Project;
 import org.jboss.test.util.server.ServerManager;
+import org.jboss.test.util.server.ServerShutdownException;
 
 /**
  * A StopServerTask.
@@ -51,7 +53,14 @@
       }
       catch (IOException e)
       {
-         throw new BuildException("Error starting server \"" + name + "\": " + e.toString(), e);
+			if (e instanceof ServerShutdownException)
+			{
+				log("Unable to shutdown server properly: " + e, Project.MSG_ERR);
+			}
+			else
+			{
+				throw new BuildException("Error stopping server \"" + name + "\": " + e.toString(), e);
+			}
       }
    }