Commit 998a5962 authored by Andrea Orlat's avatar Andrea Orlat
Browse files

fix ov version 1090 ported to trunk

parent 3c9b10d6

Common/Servers/Scheduler/include/Core.h

+2 −2
Original line number Diff line number Diff line
@@ -93,8 +93,8 @@ public: 
	 * @throw ComponentErrors::CouldntGetComponentExImpl

	 * @throw ManagementErrors::LogFileErrorExImpl

	*/

	void startSchedule(const char* scheduleFile,const char * startSubScan) throw (ManagementErrors::ScheduleErrorExImpl,

			ManagementErrors::AlreadyRunningExImpl,ComponentErrors::MemoryAllocationExImpl,ManagementErrors::SubscanErrorExImpl,ComponentErrors::CouldntGetComponentExImpl,ManagementErrors::LogFileErrorExImpl);

	void startSchedule(const char* scheduleFile,const char * startSubScan) throw (ManagementErrors::ScheduleErrorExImpl,ManagementErrors::AlreadyRunningExImpl,

ComponentErrors::MemoryAllocationExImpl,ManagementErrors::SubscanErrorExImpl,ComponentErrors::CouldntGetComponentExImpl,ComponentErrors::CORBAProblemExImpl,ManagementErrors::LogFileErrorExImpl);

	

	 /**

	  * It clears all the alarms from the scheduler

Common/Servers/Scheduler/src/Core.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1297,7 +1297,7 @@ void CCore::setDevice(const long& deviceID) throw (ComponentErrors::CouldntGetCo 


void CCore::startSchedule(const char* scheduleFile,const char * startSubScan) throw (

		ManagementErrors::ScheduleErrorExImpl, ManagementErrors::AlreadyRunningExImpl,

		ComponentErrors::MemoryAllocationExImpl,ManagementErrors::SubscanErrorExImpl,ComponentErrors::CouldntGetComponentExImpl,ManagementErrors::LogFileErrorExImpl)

		ComponentErrors::MemoryAllocationExImpl,ManagementErrors::SubscanErrorExImpl,ComponentErrors::CouldntGetComponentExImpl,ComponentErrors::CORBAProblemExImpl,ManagementErrors::LogFileErrorExImpl)

{

	//no need to get the mutex, because it is already done inside the Schedule Executor thread

	if (m_schedExecuter) {