jfclere 02/01/09 03:26:08
Modified: webapp/lib wa_request.c
Log:
Call wa_startup() if the application is not deployed.
The problem was when starting Apache before Tomcat.
Submitted by: Martin van den Bemt, [EMAIL PROTECTED]
Revision Changes Path
1.17 +11 -3 jakarta-tomcat-connectors/webapp/lib/wa_request.c
Index: wa_request.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/lib/wa_request.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- wa_request.c 19 Oct 2001 20:04:58 -0000 1.16
+++ wa_request.c 9 Jan 2002 11:26:08 -0000 1.17
@@ -55,7 +55,7 @@
* *
* ========================================================================= */
-/* @version $Id: wa_request.c,v 1.16 2001/10/19 20:04:58 pier Exp $ */
+/* @version $Id: wa_request.c,v 1.17 2002/01/09 11:26:08 jfclere Exp $ */
#include <wa.h>
/* Allocate a new request structure. */
@@ -194,8 +194,16 @@
/* Invoke a request in a web application. */
int wa_rinvoke(wa_request *r, wa_application *a) {
- if (a->depl!=wa_true)
- return(wa_rerror(WA_MARK,r,404,"Web-application not yet deployed"));
+ /*
+ * If the application is not yet deployed that could be because
+ * Apache was started before Tomcat.
+ */
+ if (a->depl!=wa_true) {
+ wa_log(WA_MARK, "Re-Trying to deploy connections");
+ wa_startup();
+ if (a->depl!=wa_true)
+ return(wa_rerror(WA_MARK,r,404,"Web-application not yet deployed"));
+ }
return(a->conn->prov->handle(r,a));
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
