cziegeler 01/06/05 01:14:01
Modified: src/org/apache/cocoon/servlet CocoonServlet.java
Log:
Fixed handling of allow-reload parameter
Revision Changes Path
1.13 +3 -3 xml-cocoon2/src/org/apache/cocoon/servlet/CocoonServlet.java
Index: CocoonServlet.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/servlet/CocoonServlet.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- CocoonServlet.java 2001/05/31 20:50:35 1.12
+++ CocoonServlet.java 2001/06/05 08:13:58 1.13
@@ -58,7 +58,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Stefano Mazzocchi</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Nicola Ken Barozzi</a> Aisa
* @author <a href="mailto:[EMAIL PROTECTED]";>Berin Loritsch</a>
- * @version CVS $Revision: 1.12 $ $Date: 2001/05/31 20:50:35 $
+ * @version CVS $Revision: 1.13 $ $Date: 2001/06/05 08:13:58 $
*/
public class CocoonServlet extends HttpServlet {
@@ -631,12 +631,12 @@
* @returns Cocoon
*/
private Cocoon getCocoon(final String pathInfo, final String reloadParam) {
- if (this.cocoon != null) {
+ if (this.cocoon != null && this.allowReload == true) {
if (this.cocoon.modifiedSince(this.creationTime)) {
log.info("Configuration changed reload attempt");
this.createCocoon();
return this.cocoon;
- } else if ((pathInfo == null) && (this.allowReload == true) &&
(reloadParam != null)) {
+ } else if ((pathInfo == null) && (reloadParam != null)) {
log.info("Forced reload attempt");
this.createCocoon();
return this.cocoon;
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
