Commit fa40d772 authored by Andrea Orlati's avatar Andrea Orlati
Browse files

issue #588: adjusted logic in closeScan (if no scan is running it does not... 

issue #588: adjusted logic in closeScan (if no scan is running it does not return an error anymore).
parent bf7de0b5

Medicina/Configuration/CDB/alma/MANAGEMENT/Palmiro/Palmiro.xml

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
             AntennaBossInterface="IDL:alma/Antenna/AntennaBoss:1.0"

             ObservatoryInterface="IDL:alma/Antenna/Observatory:1.0"

	     ReceiversBossInterface="IDL:alma/Receivers/ReceiversBoss:1.0"

	     MinorServoBossInterface=""

	     MinorServoBossInterface="IDL:alma/MinorServo/MinorServoBoss:1.0"

	     ActiveSurfaceBossInterface=""

		 	 CustomLoggerInterface="IDL:alma/Management/CustomLogger:1.0"

	     	 WeatherStationInstance="IDL:alma/Weather/GenericWeatherStation:1.0"

Medicina/Servers/MedicinaMinorServo/src/MinorServoBossImpl.cpp

+3 −1
Original line number Diff line number Diff line
@@ -790,7 +790,9 @@ throw (MinorServoErrors::MinorServoErrorsEx, 
        m_servo_status.scan_active = false;

    }else{

        timeToStop = 0;

        THROW_MINORSERVO_EX(StatusErrorEx, "no scan active", true);

	CUSTOM_LOG(LM_FULL_INFO, "MinorServo::MinorServoBossImpl::closeScan",

               (LM_DEBUG, "No scan presently active"));

        //THROW_MINORSERVO_EX(StatusErrorEx, "no scan active", true);

    }

}