Author: chatellier Date: 2009-02-17 17:09:35 +0000 (Tue, 17 Feb 2009) New Revision: 1824 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java Log: Improve concurrency... Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java 2009-02-17 17:08:29 UTC (rev 1823) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java 2009-02-17 17:09:35 UTC (rev 1824) @@ -169,9 +169,7 @@ if (control.isStopSimulationRequest() || (getParentJob() != null && getParentJob().getItem() .getControl().isStopSimulationRequest())) { - log - .info(_( - "Not start simulation %s because user ask stop", + log.info(_("Not start simulation %s because user ask stop", id)); return; } @@ -220,7 +218,7 @@ int lastDate = lastYear * Month.NUMBER_OF_MONTH; control.setProgressMax(lastDate);*/ - SimulationStorage simulation = null; + //SimulationStorage simulation = null; if (!onlyCheckControl) { File zip = item.getSimulationZip(); launcher.simulate(simulationService, control, zip); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2009-02-17 17:08:29 UTC (rev 1823) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2009-02-17 17:09:35 UTC (rev 1824) @@ -25,7 +25,6 @@ import java.io.FileOutputStream; import java.io.IOException; import java.rmi.RemoteException; -import java.util.Calendar; import java.util.Date; import java.util.Map; import java.util.Properties; @@ -197,7 +196,7 @@ } } - public void simulationStart(SimulationJob job) { + public synchronized void simulationStart(SimulationJob job) { String monitorKey = job.getId(); SimulatorLauncher launcher = job.getLauncher(); @@ -246,7 +245,7 @@ * * @param job job that control the simulation */ - public void simulationStop(SimulationJob job) { + public synchronized void simulationStop(SimulationJob job) { String monitorKey = job.getId(); properties.remove(monitorKey); @@ -399,16 +398,15 @@ // post manage this storage exportResult(job, simulation); - - // notify simulation ended - // to not check later... - simulationStop(job); } catch (RemoteException e) { if (log.isErrorEnabled()) { log.error("Can't get simulation results after simulation end", e); } } finally { + // notify simulation ended + // to not check later... + simulationStop(job); service.fireStopEvent(job); }