cvs commit: cocoon-2.1/src/blocks/cron/java/org/apache/cocoon/components/cron QuartzJobExecutor.java

[unico]

unico       2004/03/22 04:45:32

  Modified:    src/blocks/cron/java/org/apache/cocoon/components/cron
                        QuartzJobExecutor.java
  Log:
  release job only if it was obtained from the service manager
  
  Revision  Changes    Path
  1.7       +4 -3      
cocoon-2.1/src/blocks/cron/java/org/apache/cocoon/components/cron/QuartzJobExecutor.java
  
  Index: QuartzJobExecutor.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/blocks/cron/java/org/apache/cocoon/components/cron/QuartzJobExecutor.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- QuartzJobExecutor.java    11 Mar 2004 15:38:31 -0000      1.6
  +++ QuartzJobExecutor.java    22 Mar 2004 12:45:32 -0000      1.7
  @@ -89,7 +89,7 @@
                        throw new JobExecutionException(mue);
                }
           CocoonComponentManager.enterEnvironment(env, env.getManager(), 
env.getProcessor());
  -
  +        boolean release = false;
           try {
               jobrole = (String)data.get(QuartzJobScheduler.DATA_MAP_ROLE);
   
  @@ -97,6 +97,7 @@
                   job = data.get(QuartzJobScheduler.DATA_MAP_OBJECT);
               } else {
                   job = manager.lookup(jobrole);
  +                release = true;
               }
   
               if (job instanceof ConfigurableCronJob) {
  @@ -127,7 +128,7 @@
               
               CocoonComponentManager.leaveEnvironment();
   
  -            if (null != manager) {
  +            if (release && null != manager) {
                   manager.release(job);
               }
           }