jruaux 2003/01/17 08:38:59
Modified: Eclipse-Plugin/src/java/org/apache/cactus/eclipse/containers/ant
StartServerHelper.java
Log:
Corrected cancellation during container startup
Revision Changes Path
1.10 +7 -7
jakarta-cactus/Eclipse-Plugin/src/java/org/apache/cactus/eclipse/containers/ant/StartServerHelper.java
Index: StartServerHelper.java
===================================================================
RCS file:
/home/cvs/jakarta-cactus/Eclipse-Plugin/src/java/org/apache/cactus/eclipse/containers/ant/StartServerHelper.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- StartServerHelper.java 16 Jan 2003 11:37:04 -0000 1.9
+++ StartServerHelper.java 17 Jan 2003 16:38:58 -0000 1.10
@@ -164,18 +164,18 @@
// Continuously try calling the test URL until it succeeds
while (true)
{
-
- if (!isURLCallable())
- {
- sleep(500);
- pm.worked(1);
- continue;
- }
+ // If the user cancelled the start
if (pm.isCanceled())
{
throw new BuildException(
CactusMessages.getString(
"CactusLaunch.message.start.error"));
+ }
+ if (!isURLCallable())
+ {
+ sleep(500);
+ pm.worked(1);
+ continue;
}
break;
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
