remm 2003/09/23 23:56:21
Modified: catalina/src/share/org/apache/catalina/core
LocalStrings.properties StandardWrapper.java
Log:
- Fix obvious issues with wait-for-unload logic (untested).
Revision Changes Path
1.10 +1 -0
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/LocalStrings.properties
Index: LocalStrings.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/LocalStrings.properties,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- LocalStrings.properties 17 Aug 2003 08:30:44 -0000 1.9
+++ LocalStrings.properties 24 Sep 2003 06:56:21 -0000 1.10
@@ -165,3 +165,4 @@
standardWrapper.unavailable=Marking servlet {0} as unavailable
standardWrapper.unloadException=Servlet {0} threw unload() exception
standardWrapper.unloading=Cannot allocate servlet {0} because it is being unloaded
+standardWrapper.waiting=Waiting for {0} instance(s) to be deallocated
1.33 +9 -9
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardWrapper.java
Index: StandardWrapper.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardWrapper.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- StandardWrapper.java 17 Sep 2003 23:26:33 -0000 1.32
+++ StandardWrapper.java 24 Sep 2003 06:56:21 -0000 1.33
@@ -1233,13 +1233,13 @@
// (possibly more than once if non-STM)
if (countAllocated > 0) {
int nRetries = 0;
- while (nRetries < 10) {
- if (nRetries == 0) {
- log.info("Waiting for " + countAllocated +
- " instance(s) to be deallocated");
+ while ((nRetries < 21) && (countAllocated > 0)) {
+ if ((nRetries % 10) == 0) {
+ log.info(sm.getString("standardWrapper.waiting",
+ new Integer(countAllocated)));
}
try {
- Thread.sleep(50);
+ Thread.sleep(100);
} catch (InterruptedException e) {
;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
