Browse Source

Merge pull request #706 in CORE/base-third from bugfix/10.0 to feature/10.0

* commit '65955a49a35ece403ae75a754b1c154e74fdb522':
  DEC-14434 修改pom
  DEC-14434 添加依賴,改变日志实现,解决not found问题,修改报错的JavaDoc
research/11.0
superman 4 years ago
parent
commit
bcc19dc71f
  1. 5
      fine-quartz/pom.xml
  2. 4
      fine-quartz/src/main/java/com/fr/third/v2/org/quartz/core/QuartzSchedulerThread.java
  3. 6
      fine-quartz/src/main/java/com/fr/third/v2/org/quartz/impl/jdbcjobstore/JobStoreSupport.java

5
fine-quartz/pom.xml

@ -104,5 +104,10 @@
<scope>system</scope> <scope>system</scope>
<systemPath>${basedir}/lib/quartz-stubs-2.1.7.jar</systemPath> <systemPath>${basedir}/lib/quartz-stubs-2.1.7.jar</systemPath>
</dependency> </dependency>
<dependency>
<groupId>com.fr.third</groupId>
<artifactId>fine-jboss-logging</artifactId>
<version>${revision}</version>
</dependency>
</dependencies> </dependencies>
</project> </project>

4
fine-quartz/src/main/java/com/fr/third/v2/org/quartz/core/QuartzSchedulerThread.java

@ -375,7 +375,7 @@ public class QuartzSchedulerThread extends Thread {
shell = qsRsrcs.getJobRunShellFactory().createJobRunShell(bndle); shell = qsRsrcs.getJobRunShellFactory().createJobRunShell(bndle);
shell.initialize(qs); shell.initialize(qs);
} catch (SchedulerException se) { } catch (SchedulerException se) {
org.jboss.logging.Logger.getLogger(getClass()).error("---------error occur in job run shell initialize, jobKey:"+triggers.get(i).getJobKey(), se); com.fr.third.org.jboss.logging.Logger.getLogger(getClass()).error("---------error occur in job run shell initialize, jobKey:"+triggers.get(i).getJobKey(), se);
qsRsrcs.getJobStore().triggeredJobComplete(triggers.get(i), bndle.getJobDetail(), CompletedExecutionInstruction.SET_ALL_JOB_TRIGGERS_ERROR); qsRsrcs.getJobStore().triggeredJobComplete(triggers.get(i), bndle.getJobDetail(), CompletedExecutionInstruction.SET_ALL_JOB_TRIGGERS_ERROR);
continue; continue;
} }
@ -386,7 +386,7 @@ public class QuartzSchedulerThread extends Thread {
// a thread pool being used concurrently - which the docs // a thread pool being used concurrently - which the docs
// say not to do... // say not to do...
getLog().error("ThreadPool.runInThread() return false!"); getLog().error("ThreadPool.runInThread() return false!");
org.jboss.logging.Logger.getLogger(getClass()).error("---------error occur in job shell run in thread, jobKey:"+triggers.get(i).getJobKey()); com.fr.third.org.jboss.logging.Logger.getLogger(getClass()).error("---------error occur in job shell run in thread, jobKey:"+triggers.get(i).getJobKey());
qsRsrcs.getJobStore().triggeredJobComplete(triggers.get(i), bndle.getJobDetail(), CompletedExecutionInstruction.SET_ALL_JOB_TRIGGERS_ERROR); qsRsrcs.getJobStore().triggeredJobComplete(triggers.get(i), bndle.getJobDetail(), CompletedExecutionInstruction.SET_ALL_JOB_TRIGGERS_ERROR);
} }

6
fine-quartz/src/main/java/com/fr/third/v2/org/quartz/impl/jdbcjobstore/JobStoreSupport.java

@ -1417,7 +1417,7 @@ public abstract class JobStoreSupport implements JobStore, Constants {
return getDelegate().selectJobDetail(conn, key, return getDelegate().selectJobDetail(conn, key,
getClassLoadHelper()); getClassLoadHelper());
} catch (ClassNotFoundException e) { } catch (ClassNotFoundException e) {
org.jboss.logging.Logger.getLogger(getClass()).error("---------job class not found, jobKey: "+key, e); com.fr.third.org.jboss.logging.Logger.getLogger(getClass()).error("---------job class not found, jobKey: "+key, e);
throw new JobPersistenceException( throw new JobPersistenceException(
"Couldn't retrieve job because a required class was not found: " "Couldn't retrieve job because a required class was not found: "
+ e.getMessage(), e); + e.getMessage(), e);
@ -3746,7 +3746,7 @@ public abstract class JobStoreSupport implements JobStore, Constants {
* the a transaction template. If no return value is required, execute * the a transaction template. If no return value is required, execute
* should just return null. * should just return null.
* *
* @see JobStoreSupport#executeInNonManagedTXLock(String, TransactionCallback) * @see JobStoreSupport#executeInNonManagedTXLock(String, TransactionCallback, TransactionValidator)
* @see JobStoreSupport#executeInLock(String, TransactionCallback) * @see JobStoreSupport#executeInLock(String, TransactionCallback)
* @see JobStoreSupport#executeWithoutLock(TransactionCallback) * @see JobStoreSupport#executeWithoutLock(TransactionCallback)
*/ */
@ -3762,7 +3762,7 @@ public abstract class JobStoreSupport implements JobStore, Constants {
* Implement this interface to provide the code to execute within * Implement this interface to provide the code to execute within
* the a transaction template that has no return value. * the a transaction template that has no return value.
* *
* @see JobStoreSupport#executeInNonManagedTXLock(String, TransactionCallback) * @see JobStoreSupport#executeInNonManagedTXLock(String, TransactionCallback, TransactionValidator)
*/ */
protected abstract class VoidTransactionCallback implements TransactionCallback<Void> { protected abstract class VoidTransactionCallback implements TransactionCallback<Void> {
public final Void execute(Connection conn) throws JobPersistenceException { public final Void execute(Connection conn) throws JobPersistenceException {

Loading…
Cancel
Save