Bug Fix: correct job number when loading jobs

diff --git a/src/Launcher/Launcher.cxx b/src/Launcher/Launcher.cxx
index f0d731297f5890dac1791856a4e75047c4712410..919f2fcc0374cfba21dc4a573459ab10765182f9 100644 (file)
--- 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 2059e0eb4e060e4f07754476d3cca4d532c3cff0..81057af1ed711e40e5c62889e2ced1b51af3b24f 100644 (file)
--- 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 e0c90eda28d9d7d6e3de451e79c063543620f97e..55e604ec4c5a15781b390a20bf4288bf6a933f3c 100644 (file)
--- 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);