Author: chatellier Date: 2009-04-29 14:35:39 +0000 (Wed, 29 Apr 2009) New Revision: 2154 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationProperties.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulatorLauncher.java Log: Start simulation uploading before importing zip Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationProperties.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationProperties.java 2009-04-29 14:12:34 UTC (rev 2153) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationProperties.java 2009-04-29 14:35:39 UTC (rev 2154) @@ -52,11 +52,14 @@ } catch (IOException e) { log.warn(_("isisfish.error.load.file", file)); } finally { - if (reader != null) try { - reader.close(); - } catch (IOException e) { - //TODO + if (reader != null) { + try { + reader.close(); + } catch (IOException e) { + //TODO + } } + } } } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2009-04-29 14:12:34 UTC (rev 2153) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2009-04-29 14:35:39 UTC (rev 2154) @@ -338,6 +338,10 @@ File resultZipFile = downloadZIPResults(sshSession, control.getId(), md5sum); if (resultZipFile != null) { + + // FIXME done here to not break upload during import + simulationEnded(); + SimulationStorage.importZip(resultZipFile); if (log.isDebugEnabled()) { 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-04-29 14:12:34 UTC (rev 2153) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2009-04-29 14:35:39 UTC (rev 2154) @@ -468,7 +468,8 @@ SimulationControl control = job.getItem().getControl(); // Release one available resource on launcher - launcher.simulationEnded(); + // FIXME done by launcher himself + //launcher.simulationEnded(); if (log.isInfoEnabled()) { log.info("Do post simulation operation for " + control.getId()); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulatorLauncher.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulatorLauncher.java 2009-04-29 14:12:34 UTC (rev 2153) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulatorLauncher.java 2009-04-29 14:35:39 UTC (rev 2154) @@ -111,6 +111,8 @@ * Call it before starting a simulation. * * This call is bloquing until available resources. + * + * @deprecated managed by launcher himelf */ public void simulationStarted(); @@ -118,6 +120,8 @@ * Call it after simulation end. * * Release one resources. + * + * @deprecated managed by launcher himelf */ public void simulationEnded(); }