April 2010 - Isis-fish-commits - mailman.cloud.codelutin.com

r3019 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 07 Apr '10

07 Apr '10

Author: chatellier Date: 2010-04-07 08:53:23 +0000 (Wed, 07 Apr 2010) New Revision: 3019 Modified: isis-fish/trunk/changelog.txt Log: Update date Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2010-04-07 08:52:25 UTC (rev 3018) +++ isis-fish/trunk/changelog.txt 2010-04-07 08:53:23 UTC (rev 3019) @@ -4,7 +4,7 @@ * Fix a migration problem on region with non null empty map list * Fix a problem with failing region saves (was blocking all saving actions) - -- mer. avril 7 10:33:58 CEST 2010 + -- mer. avril 7 10:59:46 CEST 2010 isis-fish (3.3.0.1) stable; urgency=low

1 0

r3018 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 07 Apr '10

07 Apr '10

Author: chatellier Date: 2010-04-07 08:52:25 +0000 (Wed, 07 Apr 2010) New Revision: 3018 Modified: isis-fish/trunk/changelog.txt Log: Update changelog Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2010-04-07 08:50:54 UTC (rev 3017) +++ isis-fish/trunk/changelog.txt 2010-04-07 08:52:25 UTC (rev 3018) @@ -1,5 +1,6 @@ isis-fish (3.3.0.2) stable; urgency=low + * Fix a NPE when reloading in process simulation * Fix a migration problem on region with non null empty map list * Fix a problem with failing region saves (was blocking all saving actions)

1 0

r3017 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 07 Apr '10

07 Apr '10

Author: chatellier Date: 2010-04-07 08:50:54 +0000 (Wed, 07 Apr 2010) New Revision: 3017 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java Log: Fix a potential NPE when restarting in process simulation 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 2010-04-07 08:43:34 UTC (rev 3016) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2010-04-07 08:50:54 UTC (rev 3017) @@ -586,29 +586,40 @@ // force le download dans le cas de ssh SimulationStorage simulation = launcher.getSimulationStorage( service, control); + + //TODO simulation is null here when a in process simulation + //TODO has been restarted - // on ne fait de post traitement que si - // la simulation n'a pas été arretée - if (!control.isStopSimulationRequest()) { - // post manage this storage - boolean simulationAvailble = true; //exportResult(job, simulation); - - // do posts actions - for (PostAction action : job.getPostActions()) { - try { - action.finished(job, simulation); - } catch (Exception eee) { - if (log.isErrorEnabled()) { - log.error(_("Can't do post action %s", action), eee); + if (simulation != null) { + // on ne fait de post traitement que si + // la simulation n'a pas été arretée + if (!control.isStopSimulationRequest()) { + // post manage this storage + boolean simulationAvailable = true; //exportResult(job, simulation); + + // do posts actions + for (PostAction action : job.getPostActions()) { + try { + action.finished(job, simulation); + } catch (Exception eee) { + if (log.isErrorEnabled()) { + log.error(_("Can't do post action %s", action), eee); + } } } + + // sensitivity calculator analyze result call + // can't do analyze second pass if simulation + // has been deleted + if (simulationAvailable) { + analyzeSensitivityResult(job, simulation); + } } - - // sensitivity calculator analyze result call - // can't do analyze second pass if simulation - // has been deleted - if (simulationAvailble) { - analyzeSensitivityResult(job, simulation); + } + else { + // allow simulation to restart to be properly removed + if (log.isWarnEnabled()) { + log.warn("Check null simulation check (launcher return null simulation)"); } }

1 0

r3016 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script
by chatellier＠users.labs.libre-entreprise.org 07 Apr '10

07 Apr '10

Author: chatellier Date: 2010-04-07 08:43:34 +0000 (Wed, 07 Apr 2010) New Revision: 3016 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java Log: Fix always NPE code Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2010-04-07 08:28:20 UTC (rev 3015) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2010-04-07 08:43:34 UTC (rev 3016) @@ -657,7 +657,7 @@ UpdateDialogUI ui = new UpdateDialogUI(); ui.setVisible(true); //TODO Use FileState new mechanism to obtain state - if (codeStorage == null) { + if (codeStorage != null) { codeStorage.update(); codeStorage.reload(); }

1 0

r3015 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 07 Apr '10

07 Apr '10

Author: chatellier Date: 2010-04-07 08:28:20 +0000 (Wed, 07 Apr 2010) New Revision: 3015 Modified: isis-fish/trunk/changelog.txt Log: Update changelog. Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2010-04-07 08:25:35 UTC (rev 3014) +++ isis-fish/trunk/changelog.txt 2010-04-07 08:28:20 UTC (rev 3015) @@ -1,3 +1,10 @@ +isis-fish (3.3.0.2) stable; urgency=low + + * Fix a migration problem on region with non null empty map list + * Fix a problem with failing region saves (was blocking all saving actions) + + -- mer. avril 7 10:33:58 CEST 2010 + isis-fish (3.3.0.1) stable; urgency=low * Make java path configurable on cluster server (caparmor & noumea)

1 0

r3014 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/migration
by chatellier＠users.labs.libre-entreprise.org 07 Apr '10

07 Apr '10

Author: chatellier Date: 2010-04-07 08:25:35 +0000 (Wed, 07 Apr 2010) New Revision: 3014 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/SwingMigrationCallbackHandler.java Log: Sur certaines cartes la liste des cartes est une chaine vide non nulle et la migration fait n'importe quoi. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/SwingMigrationCallbackHandler.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/SwingMigrationCallbackHandler.java 2010-04-01 09:13:53 UTC (rev 3013) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/SwingMigrationCallbackHandler.java 2010-04-07 08:25:35 UTC (rev 3014) @@ -159,7 +159,7 @@ "update RESULT set matrix_semantics = replace(matrix_semantics, 'org.codelutin.', 'org.nuiton.') where matrix_semantics IS NOT null;", "update STRATEGYMONTHINFO set proportionMetier_semantics = replace(proportionMetier_semantics, 'org.codelutin.', 'org.nuiton.') where proportionMetier_semantics IS NOT null;", // add .shp default extension - "update FISHERYREGION set MAPFILES = regexp_replace(MAPFILES, '(,|$)', '.shp$1') where MAPFILES IS NOT null;" + "update FISHERYREGION set MAPFILES = regexp_replace(MAPFILES, '(,|$)', '.shp$1') where MAPFILES IS NOT null AND LENGTH(TRIM(MAPFILES)) > 0;" }; for (String sql : sqls) { log.info("try " + sql);

1 0

r3013 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish: . ui/input
by chatellier＠users.labs.libre-entreprise.org 01 Apr '10

01 Apr '10

Author: chatellier Date: 2010-04-01 09:13:53 +0000 (Thu, 01 Apr 2010) New Revision: 3013 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java Log: Add rollback on topia context if commit fails. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2010-03-30 15:29:51 UTC (rev 3012) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2010-04-01 09:13:53 UTC (rev 3013) @@ -113,7 +113,7 @@ * migration de donnees demande automatiquement un changement de version * d'application. */ - protected final static Version version = new Version(3, 3, 0, 1); + protected final static Version version = new Version(3, 3, 0, 2); protected final static Version databaseVersion = new Version( version.getNumber(0), version.getNumber(1)); protected final static Version apiVersion = new Version( Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2010-03-30 15:29:51 UTC (rev 3012) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2010-04-01 09:13:53 UTC (rev 3013) @@ -315,7 +315,7 @@ /** * Save all non saved entities. * - * Change registred button states. + * Change registered button states. * Commit opened topia context. */ protected void topiaSave() { @@ -331,10 +331,21 @@ rootUI.repaintNode(currentNode.getContextPath()); rootUI.setStatusMessage(_("isisfish.message.save.finished")); } catch (TopiaException eee) { - if (log.isErrorEnabled()) { - log.error("Can't save region", eee); + + // EC-20100401 : ajouté pour avoir un context + // correct apres un erreur, sinon, on ne peut plus rien faire + // rien sauver d'autre... + try { + isisContext.rollbackTransaction(); + if (log.isErrorEnabled()) { + log.error("Can't save entity", eee); + } + ErrorHelper.showErrorDialog(_("isisfish.error.input.saveentity"), eee); + } catch (TopiaException eee2) { + if (log.isErrorEnabled()) { + log.error("Can't save or rollback entity", eee2); + } } - ErrorHelper.showErrorDialog(_("isisfish.error.input.saveentity"), eee); } }

1 0