From dcafd65ea844a1732f6795880b26f89c4090d7b6 Mon Sep 17 00:00:00 2001 From: ribes Date: Thu, 27 Oct 2011 09:35:21 +0000 Subject: [PATCH] Bug Fix: correct job number when loading jobs --- src/Launcher/Launcher.cxx | 2 +- src/Launcher/Launcher.hxx | 2 +- src/Launcher/SALOME_Launcher.hxx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Launcher/Launcher.cxx b/src/Launcher/Launcher.cxx index f0d731297..919f2fcc0 100644 --- a/src/Launcher/Launcher.cxx +++ b/src/Launcher/Launcher.cxx @@ -628,8 +628,8 @@ Launcher_cpp::addJobDirectlyToMap(Launcher::Job * new_job, const std::string job { // Step 0: Calculated job_id pthread_mutex_lock(_job_cpt_mutex); - _job_cpt++; int job_id = _job_cpt; + _job_cpt++; new_job->setNumber(job_id); pthread_mutex_unlock(_job_cpt_mutex); diff --git a/src/Launcher/Launcher.hxx b/src/Launcher/Launcher.hxx index 2059e0eb4..81057af1e 100644 --- a/src/Launcher/Launcher.hxx +++ b/src/Launcher/Launcher.hxx @@ -55,7 +55,7 @@ class LAUNCHER_EXPORT Launcher_cpp public: Launcher_cpp(); - ~Launcher_cpp(); + virtual ~Launcher_cpp(); // Main interface void createJob(Launcher::Job * new_job); diff --git a/src/Launcher/SALOME_Launcher.hxx b/src/Launcher/SALOME_Launcher.hxx index e0c90eda2..55e604ec4 100644 --- a/src/Launcher/SALOME_Launcher.hxx +++ b/src/Launcher/SALOME_Launcher.hxx @@ -43,7 +43,7 @@ class SALOMELAUNCHER_EXPORT SALOME_Launcher: public: SALOME_Launcher(CORBA::ORB_ptr orb, PortableServer::POA_var poa); - ~SALOME_Launcher(); + virtual ~SALOME_Launcher(); // Main methods CORBA::Long createJob (const Engines::JobParameters & job_parameters); -- 2.39.2