Author: chatellier Date: 2009-03-20 10:26:52 +0000 (Fri, 20 Mar 2009) New Revision: 2014 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java Log: Can't do second pass if simulation has been delete. 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-03-19 18:27:47 UTC (rev 2013) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2009-03-20 10:26:52 UTC (rev 2014) @@ -43,7 +43,6 @@ import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.IsisFishException; import fr.ifremer.isisfish.datastore.AnalysePlanStorage; -import fr.ifremer.isisfish.datastore.ExportStorage; import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.simulator.AnalysePlan; import fr.ifremer.isisfish.simulator.SimulationControl; @@ -462,10 +461,14 @@ service, control); // post manage this storage - exportResult(job, simulation); + boolean simulationAvailble = exportResult(job, simulation); // sensitivity calculator analyze result call - analyzeSensitivityResult(job, simulation); + // can't do analyze seond pass if simulation + // has been deleted + if (simulationAvailble) { + analyzeSensitivityResult(job, simulation); + } } } catch (RemoteException e) { if (log.isErrorEnabled()) { @@ -483,9 +486,13 @@ /** * Export result, and delete simulation if "onlyExport" has * been selected. + * + * @return <tt>true</tt> if simulation is styll available (not delete by onlyExport) */ - protected void exportResult(SimulationJob job, SimulationStorage simulation) { + protected boolean exportResult(SimulationJob job, SimulationStorage simulation) { + boolean simulationAvailble = true; + SimulationParameter param = job.getItem().getParameter(); SimulationControl control = job.getItem().getControl(); String id = control.getId(); @@ -535,6 +542,7 @@ } simulation.delete(false); + simulationAvailble = false; } else { // log if (log.isDebugEnabled()) { @@ -562,6 +570,8 @@ } } } + + return simulationAvailble; } /**