Update of /cvsroot/springnet/Spring.Net.Integration/projects/Spring.Scheduling.Quartz/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv24017/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz
Modified Files:
SchedulerFactoryObject.cs
Log Message:
Support for VS2008 and small fix to check whether quartz properties is null before merging
Index: SchedulerFactoryObject.cs
===================================================================
RCS file: /cvsroot/springnet/Spring.Net.Integration/projects/Spring.Scheduling.Quartz/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/SchedulerFactoryObject.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SchedulerFactoryObject.cs 1 Dec 2007 20:37:08 -0000 1.4
--- SchedulerFactoryObject.cs 9 Jun 2008 10:03:14 -0000 1.5
***************
*** 710,714 ****
}
! MergePropertiesIntoMap(quartzProperties, mergedProps);
--- 710,718 ----
}
! if (quartzProperties != null)
! {
! // if given quartz properties, merge to them to configuration
! MergePropertiesIntoMap(quartzProperties, mergedProps);
! }
|
