Author: chatellier Date: 2009-11-12 17:23:20 +0000 (Thu, 12 Nov 2009) New Revision: 2754 Modified: isis-fish/branches/isis-fish-3.2.0.8/changelog.txt isis-fish/branches/isis-fish-3.2.0.8/pom.xml isis-fish/branches/isis-fish-3.2.0.8/src/main/java/fr/ifremer/isisfish/IsisConfig.java isis-fish/branches/isis-fish-3.2.0.8/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java Log: Fix a problem with dependant plans not blocked on current simulation Modified: isis-fish/branches/isis-fish-3.2.0.8/changelog.txt =================================================================== --- isis-fish/branches/isis-fish-3.2.0.8/changelog.txt 2009-11-12 17:15:10 UTC (rev 2753) +++ isis-fish/branches/isis-fish-3.2.0.8/changelog.txt 2009-11-12 17:23:20 UTC (rev 2754) @@ -1,7 +1,7 @@ isis-fish (3.2.0.10) stable; urgency=high * Increase default java memory for caparmor jobs (2Go) - * Fix a problem with dependant plans not bloqued on current simulation + * Fix a problem with dependant plans not blocked on current simulation -- jeu. nov. 12 18:05:49 CET 2009 Modified: isis-fish/branches/isis-fish-3.2.0.8/pom.xml =================================================================== --- isis-fish/branches/isis-fish-3.2.0.8/pom.xml 2009-11-12 17:15:10 UTC (rev 2753) +++ isis-fish/branches/isis-fish-3.2.0.8/pom.xml 2009-11-12 17:23:20 UTC (rev 2754) @@ -13,7 +13,7 @@ <groupId>ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>3.2.0.9</version> + <version>3.2.0.10</version> <!-- POM Relationships : Inheritance : Dependencies --> <dependencies> @@ -585,9 +585,9 @@ <!-- *** Build Environment ************************************** --> <!-- ************************************************************* --> <scm> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/tags/isis-fish-3.2.0.9</connection> - <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/tags/isis-fish-3.2.0.9</developerConnection> - <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/isis-fish/tags/isis-fish-3.2.0.9?root=isis-fish</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/tags/isis-fish-3.2.0.10</connection> + <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/tags/isis-fish-3.2.0.10</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/isis-fish/tags/isis-fish-3.2.0.10?root=isis-fish</url> </scm> <!--Code Lutin Repository--> Modified: isis-fish/branches/isis-fish-3.2.0.8/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- isis-fish/branches/isis-fish-3.2.0.8/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-11-12 17:15:10 UTC (rev 2753) +++ isis-fish/branches/isis-fish-3.2.0.8/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-11-12 17:23:20 UTC (rev 2754) @@ -121,7 +121,7 @@ * migration de donnees demande automatiquement un changement de version * d'application. */ - protected final static VersionNumber version = new VersionNumber(3, 2, 0, 9); + protected final static VersionNumber version = new VersionNumber(3, 2, 0, 10); protected final static VersionNumber databaseVersion = new VersionNumber( version.getNumber(0), version.getNumber(1)); protected final static VersionNumber apiVersion = new VersionNumber( Modified: isis-fish/branches/isis-fish-3.2.0.8/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java =================================================================== --- isis-fish/branches/isis-fish-3.2.0.8/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java 2009-11-12 17:15:10 UTC (rev 2753) +++ isis-fish/branches/isis-fish-3.2.0.8/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java 2009-11-12 17:23:20 UTC (rev 2754) @@ -218,6 +218,18 @@ SimulationJob subjob = i.next(); subjob.setLauncher(getLauncher()); subjob.run(); + + // FIXME temp fix les thread des launchers + // ne sont plus bloquants + // on bloque le thread par un sleep + // tant que le sous thread n'est pas fini + SimulationItem subItem = subjob.getItem(); + SimulationControl subControl = subItem.getControl(); + do { + Thread.sleep(2000); + } while (!subControl.isStopSimulationRequest() && + (subControl.getProgress() == 0 || control.getProgress() < control.getProgressMax()) + && !SimulationStorage.exists(control.getId())); } // nettoyage si besoin apres toutes les simulations