Skip to content

Commit

Permalink
Merge branch 'releaseBuildErrors' of https://github.com/jvilalta/quar…
Browse files Browse the repository at this point in the history
…tznet into jvilalta-releaseBuildErrors
  • Loading branch information
lahma committed Mar 20, 2011
2 parents 3e20104 + 5245871 commit 7413153
Show file tree
Hide file tree
Showing 19 changed files with 60 additions and 9 deletions.
4 changes: 4 additions & 0 deletions src/Quartz/IScheduler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -357,6 +357,7 @@ public interface IScheduler
/// with the same job (the new trigger must have the job name & group specified)
/// - however, the new trigger need not have the same name as the old trigger.
/// </summary>
/// <param name="triggerKey">The <see cref="ITrigger" /> to be replaced.</param>
/// <param name="newTrigger">
/// The new <see cref="ITrigger" /> to be stored.
/// </param>
Expand Down Expand Up @@ -417,6 +418,9 @@ public interface IScheduler
/// the (possibly <see langword="null" />) JobDataMap to be
/// associated with the trigger that fires the job immediately.
/// </param>
/// <param name="jobKey">
/// The <see cref="JobKey"/> of the <see cref="IJob" /> to be executed.
/// </param>
void TriggerJob(JobKey jobKey, JobDataMap data);

/// <summary>
Expand Down
1 change: 1 addition & 0 deletions src/Quartz/Impl/AdoJobStore/AdoJobStoreUtil.cs
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ private AdoJobStoreUtil()
/// </summary>
/// <param name="query">The unsubstitued query</param>
/// <param name="tablePrefix">The table prefix</param>
/// <param name="schedNameLiteral">the scheduler name</param>
/// <returns>The query, with proper table prefix substituted</returns>
public static string ReplaceTablePrefix(string query, string tablePrefix, string schedNameLiteral)
{
Expand Down
2 changes: 2 additions & 0 deletions src/Quartz/Impl/AdoJobStore/DBSemaphore.cs
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ public abstract class DBSemaphore : StdAdoConstants, ISemaphore, ITablePrefixAwa
/// Initializes a new instance of the <see cref="DBSemaphore"/> class.
/// </summary>
/// <param name="tablePrefix">The table prefix.</param>
/// <param name="schedName">the scheduler name</param>
/// <param name="defaultInsertSQL">The SQL.</param>
/// <param name="defaultSQL">The default SQL.</param>
/// <param name="dbProvider">The db provider.</param>
Expand Down Expand Up @@ -106,6 +107,7 @@ private static HashSet<string> ThreadLocks
/// <param name="conn"></param>
/// <param name="lockName"></param>
/// <param name="expandedSQL"></param>
/// <param name="expandedInsertSQL"></param>
protected abstract void ExecuteSQL(ConnectionAndTransactionHolder conn, string lockName, string expandedSQL, string expandedInsertSQL);


Expand Down
14 changes: 14 additions & 0 deletions src/Quartz/Impl/AdoJobStore/JobStoreSupport.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1402,6 +1402,7 @@ public virtual TriggerState GetTriggerState(ConnectionAndTransactionHolder conn,
/// in the <see cref="IJobStore" /> with the same name &amp; group
/// should be over-written.
/// </param>
/// <param name="updateTriggers"></param>
/// <exception cref="ObjectAlreadyExistsException">
/// if a <see cref="ICalendar" /> with the same name already
/// exists, and replaceExisting is set to false.
Expand Down Expand Up @@ -2911,6 +2912,7 @@ protected virtual IList<SchedulerStateRecord> FindFailedInstances(ConnectionAndT
/// that have no scheduler state record. Checkin timestamp and interval are
/// left as zero on these dummy <see cref="SchedulerStateRecord" /> objects.
/// </summary>
/// <param name="conn"></param>
/// <param name="schedulerStateRecords">List of all current <see cref="SchedulerStateRecord" />s</param>
private IList<SchedulerStateRecord> FindOrphanedFailedInstances(ConnectionAndTransactionHolder conn, IList<SchedulerStateRecord> schedulerStateRecords)
{
Expand Down Expand Up @@ -3257,6 +3259,9 @@ protected object ExecuteWithoutLock(Func<ConnectionAndTransactionHolder, object>
/// "TRIGGER_ACCESS". If null, then no lock is acquired, but the
/// lockCallback is still executed in a transaction.
/// </param>
/// <param name="txCallback">
/// The callback to excute after having acquired the given lock.
/// </param>
/// <seealso cref="ExecuteInLock(string,System.Func{Quartz.Impl.AdoJobStore.ConnectionAndTransactionHolder,object})" />
protected void ExecuteInLock(string lockName, Action<ConnectionAndTransactionHolder> txCallback)
{
Expand All @@ -3273,6 +3278,9 @@ protected void ExecuteInLock(string lockName, Action<ConnectionAndTransactionHol
/// "TRIGGER_ACCESS". If null, then no lock is acquired, but the
/// lockCallback is still executed in a transaction.
/// </param>
/// <param name="txCallback">
/// The callback to excute after having acquired the given lock.
/// </param>
protected abstract object ExecuteInLock(string lockName, Func<ConnectionAndTransactionHolder, object> txCallback);

/// <summary>
Expand All @@ -3287,6 +3295,9 @@ protected void ExecuteInLock(string lockName, Action<ConnectionAndTransactionHol
/// lockCallback is still executed in a non-managed transaction.
/// </param>
/// <seealso cref="ExecuteInNonManagedTXLock(string,System.Func{Quartz.Impl.AdoJobStore.ConnectionAndTransactionHolder,object})" />
/// <param name="txCallback">
/// The callback to excute after having acquired the given lock.
/// </param>
protected void ExecuteInNonManagedTXLock(string lockName, Action<ConnectionAndTransactionHolder> txCallback)
{
ExecuteInNonManagedTXLock(lockName, conn => { txCallback(conn); return null; });
Expand All @@ -3301,6 +3312,9 @@ protected void ExecuteInNonManagedTXLock(string lockName, Action<ConnectionAndTr
/// "TRIGGER_ACCESS". If null, then no lock is acquired, but the
/// lockCallback is still executed in a non-managed transaction.
/// </param>
/// <param name="txCallback">
/// The callback to excute after having acquired the given lock.
/// </param>
protected object ExecuteInNonManagedTXLock(string lockName, Func<ConnectionAndTransactionHolder, object> txCallback)
{
bool transOwner = false;
Expand Down
4 changes: 4 additions & 0 deletions src/Quartz/Impl/AdoJobStore/MySQLDelegate.cs
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,10 @@ public class MySQLDelegate : StdAdoDelegate
/// </summary>
/// <param name="logger">the logger to use during execution</param>
/// <param name="tablePrefix">the prefix of all table names</param>
/// <param name="schedName">the scheduler name</param>
/// <param name="instanceId">The instance id.</param>
/// <param name="dbProvider">The db provider.</param>
/// <param name="typeLoadHelper">the type loader helper</param>
public MySQLDelegate(ILog logger, string tablePrefix, string schedName, string instanceId, IDbProvider dbProvider, ITypeLoadHelper typeLoadHelper)
: base(logger, tablePrefix, schedName, instanceId, dbProvider, typeLoadHelper)
{
Expand All @@ -46,8 +48,10 @@ public MySQLDelegate(ILog logger, string tablePrefix, string schedName, string i
/// </summary>
/// <param name="logger">The logger.</param>
/// <param name="tablePrefix">The table prefix.</param>
/// <param name="schedName">the scheduler name</param>
/// <param name="instanceId">The instance id.</param>
/// <param name="dbProvider">The db provider.</param>
/// <param name="typeLoadHelper">the type loader helper</param>
/// <param name="useProperties">if set to <c>true</c> [use properties].</param>
public MySQLDelegate(ILog logger, string tablePrefix, string schedName, string instanceId, IDbProvider dbProvider, ITypeLoadHelper typeLoadHelper, bool useProperties)
: base(logger, tablePrefix,schedName, instanceId, dbProvider, typeLoadHelper, useProperties)
Expand Down
4 changes: 4 additions & 0 deletions src/Quartz/Impl/AdoJobStore/OracleDelegate.cs
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,10 @@ public class OracleDelegate : StdAdoDelegate
/// </summary>
/// <param name="logger">the logger to use during execution</param>
/// <param name="tablePrefix">the prefix of all table names</param>
/// <param name="schedName">the scheduler name</param>
/// <param name="instanceId">The instance id.</param>
/// <param name="dbProvider">The db provider.</param>
/// <param name="typeLoadHelper">the type loader helper</param>
public OracleDelegate(ILog logger, string tablePrefix, string schedName, string instanceId, IDbProvider dbProvider, ITypeLoadHelper typeLoadHelper)
: base(logger, tablePrefix, schedName, instanceId, dbProvider, typeLoadHelper)
{
Expand All @@ -49,8 +51,10 @@ public OracleDelegate(ILog logger, string tablePrefix, string schedName, string
/// </summary>
/// <param name="logger">The logger.</param>
/// <param name="tablePrefix">The table prefix.</param>
/// <param name="schedName">the scheduler name</param>
/// <param name="instanceId">The instance id.</param>
/// <param name="dbProvider">The db provider.</param>
/// <param name="typeLoadHelper">the type loader helper</param>
/// <param name="useProperties">if set to <c>true</c> [use properties].</param>
public OracleDelegate(ILog logger, string tablePrefix, string schedName, string instanceId, IDbProvider dbProvider, ITypeLoadHelper typeLoadHelper, bool useProperties)
: base(logger, tablePrefix, schedName, instanceId, dbProvider, typeLoadHelper, useProperties)
Expand Down
4 changes: 4 additions & 0 deletions src/Quartz/Impl/AdoJobStore/PostgreSQLDelegate.cs
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,10 @@ public class PostgreSQLDelegate : StdAdoDelegate
/// </summary>
/// <param name="logger">The logger.</param>
/// <param name="tablePrefix">The table prefix.</param>
/// <param name="schedName">the scheduler name</param>
/// <param name="instanceId">The instance id.</param>
/// <param name="dbProvider">The db provider.</param>
/// <param name="typeLoadHelper">the type loader helper</param>
public PostgreSQLDelegate(ILog logger, string tablePrefix, string schedName, string instanceId, IDbProvider dbProvider, ITypeLoadHelper typeLoadHelper)
: base(logger, tablePrefix, schedName, instanceId, dbProvider, typeLoadHelper)
{
Expand All @@ -50,8 +52,10 @@ public PostgreSQLDelegate(ILog logger, string tablePrefix, string schedName, str
/// <param name="logger">The logger.</param>
/// <param name="tablePrefix">The table prefix.</param>
/// <param name="instanceId">The instance id.</param>
/// <param name="schedName">the scheduler name</param>
/// <param name="dbProvider">The db provider.</param>
/// <param name="useProperties">if set to <c>true</c> [use properties].</param>
/// <param name="typeLoadHelper">the type loader helper</param>
public PostgreSQLDelegate(ILog logger, string tablePrefix, string schedName, string instanceId, IDbProvider dbProvider, ITypeLoadHelper typeLoadHelper, bool useProperties)
: base(logger, tablePrefix, schedName, instanceId, dbProvider, typeLoadHelper, useProperties)
{
Expand Down
4 changes: 2 additions & 2 deletions src/Quartz/Impl/AdoJobStore/SQLiteDelegate.cs
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public class SQLiteDelegate : StdAdoDelegate
/// <param name="schedName">the scheduler name</param>
/// <param name="instanceId">The instance id.</param>
/// <param name="dbProvider">The db provider</param>
/// <param name="typeLoadHelper">the type loader hgelper</param>
/// <param name="typeLoadHelper">the type loader helper</param>
public SQLiteDelegate(ILog logger, string tablePrefix, string schedName, string instanceId, IDbProvider dbProvider, ITypeLoadHelper typeLoadHelper)
: base(logger, tablePrefix, schedName, instanceId, dbProvider, typeLoadHelper)
{
Expand All @@ -54,7 +54,7 @@ public SQLiteDelegate(ILog logger, string tablePrefix, string schedName, string
/// <param name="schedName">the scheduler name</param>
/// <param name="instanceId">The instance id.</param>
/// <param name="dbProvider">The db provider</param>
/// <param name="typeLoadHelper">the type loader hgelper</param>
/// <param name="typeLoadHelper">the type loader helper</param>
/// <param name="useProperties">if set to <c>true</c>, use properties</param>
public SQLiteDelegate(ILog logger, string tablePrefix, string schedName, string instanceId, IDbProvider dbProvider,
ITypeLoadHelper typeLoadHelper, bool useProperties)
Expand Down
4 changes: 4 additions & 0 deletions src/Quartz/Impl/AdoJobStore/SqlServerDelegate.cs
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,10 @@ public class SqlServerDelegate : StdAdoDelegate
/// </summary>
/// <param name="logger">the logger to use during execution</param>
/// <param name="tablePrefix">the prefix of all table names</param>
/// <param name="schedName">the scheduler name</param>
/// <param name="instanceId">The instance id.</param>
/// <param name="dbProvider">The db provider.</param>
/// <param name="typeLoadHelper">the type loader helper</param>
public SqlServerDelegate(ILog logger, string tablePrefix, string schedName, string instanceId, IDbProvider dbProvider, ITypeLoadHelper typeLoadHelper)
: base(logger, tablePrefix, schedName, instanceId, dbProvider, typeLoadHelper)
{
Expand All @@ -49,8 +51,10 @@ public SqlServerDelegate(ILog logger, string tablePrefix, string schedName, stri
/// </summary>
/// <param name="logger">The logger.</param>
/// <param name="tablePrefix">The table prefix.</param>
/// <param name="schedName">the scheduler name</param>
/// <param name="instanceId">The instance id.</param>
/// <param name="dbProvider">The db provider.</param>
/// <param name="typeLoadHelper">the type loader helper</param>
/// <param name="useProperties">if set to <c>true</c> [use properties].</param>
public SqlServerDelegate(ILog logger, string tablePrefix, string schedName, string instanceId, IDbProvider dbProvider, ITypeLoadHelper typeLoadHelper, bool useProperties)
: base(logger, tablePrefix, schedName, instanceId, dbProvider, typeLoadHelper, useProperties)
Expand Down
5 changes: 5 additions & 0 deletions src/Quartz/Impl/AdoJobStore/StdAdoDelegate.cs
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,10 @@ public class StdAdoDelegate : StdAdoConstants, IDriverDelegate
/// </summary>
/// <param name="logger">the logger to use during execution</param>
/// <param name="tablePrefix">the prefix of all table names</param>
/// <param name="schedName">the scheduler name</param>
/// <param name="instanceId">The instance id.</param>
/// <param name="dbProvider">The db provider.</param>
/// <param name="typeLoadHelper">the type loader helper</param>
public StdAdoDelegate(ILog logger, string tablePrefix, string schedName, string instanceId, IDbProvider dbProvider, ITypeLoadHelper typeLoadHelper)
{
this.logger = logger;
Expand All @@ -81,8 +83,10 @@ public StdAdoDelegate(ILog logger, string tablePrefix, string schedName, string
/// </summary>
/// <param name="logger">the logger to use during execution</param>
/// <param name="tablePrefix">the prefix of all table names</param>
/// <param name="schedName">the scheduler name</param>
/// <param name="instanceId">The instance id.</param>
/// <param name="dbProvider">The db provider.</param>
/// <param name="typeLoadHelper">the type loader helper</param>
/// <param name="useProperties">if set to <c>true</c> [use properties].</param>
public StdAdoDelegate(ILog logger, string tablePrefix, string schedName, string instanceId, IDbProvider dbProvider,
ITypeLoadHelper typeLoadHelper, bool useProperties)
Expand Down Expand Up @@ -2236,6 +2240,7 @@ public virtual int InsertFiredTrigger(ConnectionAndTransactionHolder conn, IOper
/// <param name="trigger"></param>
/// the trigger
/// <param name="state"></param>
/// <param name="job"></param>
/// the state that the trigger should be stored in
/// <returns>the number of rows inserted</returns>
public int UpdateFiredTrigger(ConnectionAndTransactionHolder conn, IOperableTrigger trigger, string state, IJobDetail job)
Expand Down
1 change: 1 addition & 0 deletions src/Quartz/Impl/AdoJobStore/StdRowLockSemaphore.cs
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ public class StdRowLockSemaphore : DBSemaphore
/// Initializes a new instance of the <see cref="StdRowLockSemaphore"/> class.
/// </summary>
/// <param name="tablePrefix">The table prefix.</param>
/// <param name="schedName">the scheduler name</param>
/// <param name="selectWithLockSQL">The select with lock SQL.</param>
/// <param name="dbProvider"></param>
public StdRowLockSemaphore(string tablePrefix, string schedName, string selectWithLockSQL, IDbProvider dbProvider)
Expand Down
1 change: 1 addition & 0 deletions src/Quartz/Impl/AdoJobStore/UpdateRowLockSemaphore.cs
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ public UpdateLockRowSemaphore(IDbProvider provider)
/// <param name="conn"></param>
/// <param name="lockName"></param>
/// <param name="expandedSQL"></param>
/// <param name="expandedInsertSQL"></param>
protected override void ExecuteSQL(ConnectionAndTransactionHolder conn, string lockName, string expandedSQL, string expandedInsertSQL)
{
try
Expand Down
2 changes: 1 addition & 1 deletion src/Quartz/Impl/Triggers/CalendarIntervalTriggerImpl.cs
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public class CalendarIntervalTriggerImpl : AbstractTrigger, ICalendarIntervalTri
private int repeatInterval;
private IntervalUnit repeatIntervalUnit = IntervalUnit.Day;
private int timesTriggered;
private bool complete;
private bool complete = false;

/// <summary>
/// Create a <code>DateIntervalTrigger</code> with no settings.
Expand Down
2 changes: 1 addition & 1 deletion src/Quartz/Impl/Triggers/SimpleTriggerImpl.cs
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public class SimpleTriggerImpl : AbstractTrigger, ISimpleTrigger
private int repeatCount;
private TimeSpan repeatInterval = TimeSpan.Zero;
private int timesTriggered;
private bool complete;
private bool complete = false;

/// <summary>
/// Create a <see cref="SimpleTriggerImpl" /> with no settings.
Expand Down
3 changes: 3 additions & 0 deletions src/Quartz/SPI/IJobStore.cs
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ public interface IJobStore
/// given name, and store the new given one - which must be associated
/// with the same job.
/// </summary>
/// <param name="triggerKey">The <see cref="ITrigger"/> to be replaced.</param>
/// <param name="newTrigger">The new <see cref="ITrigger" /> to be stored.</param>
/// <returns>
/// <see langword="true" /> if a <see cref="ITrigger" /> with the given
Expand Down Expand Up @@ -479,6 +480,8 @@ public interface IJobStore
/// <param name="noLaterThan">If &gt; 0, the JobStore should only return a Trigger
/// that will fire no later than the time represented in this value as
/// milliseconds.</param>
/// <param name="maxCount"></param>
/// <param name="timeWindow"></param>
/// <returns></returns>
/// <seealso cref="ITrigger">
/// </seealso>
Expand Down
1 change: 1 addition & 0 deletions src/Quartz/SchedulerMetaData.cs
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ public class SchedulerMetaData
/// <param name="numberOfJobsExec">The number of jobs executed.</param>
/// <param name="jsType">The job store type.</param>
/// <param name="jsPersistent">if set to <c>true</c>, job store is persistent.</param>
/// <param name="jsClustered">if set to <c>true</c>, the job store is clustered</param>
/// <param name="tpType">The thread pool type.</param>
/// <param name="tpSize">Size of the thread pool.</param>
/// <param name="version">The version string.</param>
Expand Down
Loading

0 comments on commit 7413153

Please sign in to comment.