Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 56008 invoked from network); 22 Sep 2004 15:02:24 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 22 Sep 2004 15:02:24 -0000 Received: (qmail 74666 invoked by uid 500); 22 Sep 2004 15:02:21 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 74604 invoked by uid 500); 22 Sep 2004 15:02:20 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 74591 invoked by uid 99); 22 Sep 2004 15:02:20 -0000 X-ASF-Spam-Status: No, hits=-10.0 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Wed, 22 Sep 2004 08:02:20 -0700 Received: (qmail 55890 invoked by uid 65534); 22 Sep 2004 15:02:19 -0000 Date: 22 Sep 2004 15:02:19 -0000 Message-ID: <20040922150219.55887.qmail@minotaur.apache.org> From: unico@apache.org To: cvs@cocoon.apache.org Subject: svn commit: rev 47051 - cocoon/trunk/src/blocks/cron/java/org/apache/cocoon/components/cron X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: unico Date: Wed Sep 22 08:02:18 2004 New Revision: 47051 Modified: cocoon/trunk/src/blocks/cron/java/org/apache/cocoon/components/cron/QuartzJobExecutor.java Log: dispose on correct condition Modified: cocoon/trunk/src/blocks/cron/java/org/apache/cocoon/components/cron/QuartzJobExecutor.java ============================================================================== --- cocoon/trunk/src/blocks/cron/java/org/apache/cocoon/components/cron/QuartzJobExecutor.java (original) +++ cocoon/trunk/src/blocks/cron/java/org/apache/cocoon/components/cron/QuartzJobExecutor.java Wed Sep 22 08:02:18 2004 @@ -79,6 +79,7 @@ String jobrole = null; boolean release = false; + boolean dispose = false; try { env.startingProcessing(); EnvironmentHelper.enterProcessor(env.getProcessor(), manager, env); @@ -90,6 +91,7 @@ ContainerUtil.enableLogging(job, logger); ContainerUtil.contextualize(job, appContext); ContainerUtil.service(job, manager); + dispose = true; } else { job = manager.lookup(jobrole); release = true; @@ -127,7 +129,7 @@ if (release && manager != null) { manager.release(job); } - else if (job != null) { + if (dispose) { ContainerUtil.dispose(job); } }