Author: echatellier Date: 2014-11-05 17:47:51 +0100 (Wed, 05 Nov 2014) New Revision: 4122 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4122 Log: Fix simulation start trigger Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java 2014-11-05 16:46:58 UTC (rev 4121) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java 2014-11-05 16:47:51 UTC (rev 4122) @@ -270,12 +270,6 @@ } else { // on est sur une simple simulation, ou le resultat d'un plan - // Dans le cas d'un simulation simple seulement - // on mémorise la simulation comme "lancée" et - // devant être re monitorée au lancement d'isis - // FIXME try to remove static call - SimulationMonitor.getInstance().simulationStart(this); - /* code moved to fr.ifremer.isisfish.simulator.launcher.InProcessSimulatorLauncher.simulate(SimulationService, SimulationControl, File) // set date to 0 at beginning of simulation @@ -302,6 +296,12 @@ launcher.simulate(simulationService, item); } + // Dans le cas d'un simulation simple seulement + // on mémorise la simulation comme "lancée" et + // devant être re monitorée au lancement d'isis + // FIXME try to remove static call + SimulationMonitor.getInstance().simulationStart(this); + // simulation ended //simulation = launcher.getSimulationStorage(simulationService, // control); Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2014-11-05 16:46:58 UTC (rev 4121) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2014-11-05 16:47:51 UTC (rev 4122) @@ -579,14 +579,10 @@ * * @param job job * @param launcher {@link SimulatorLauncher} that manage simulation - * - * @return true if post operation complete and job has be removed from queue */ - protected boolean doPostSimulationOperation(SimulationJob job, + protected void doPostSimulationOperation(SimulationJob job, SimulatorLauncher launcher) { - boolean result = false; - SimulationService service = SimulationService.getService(); SimulationControl control = job.getItem().getControl(); @@ -658,16 +654,12 @@ simulationStop(job); service.fireStopEvent(job); - result = true; - } catch (RemoteException e) { if (log.isErrorEnabled()) { log.error("Can't get simulation results after simulation end", e); } } - - return result; } /**