Author: tchemit Date: 2013-09-25 18:36:22 +0200 (Wed, 25 Sep 2013) New Revision: 1226 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1226 Log: refs #3317: [TECH] - Mise ?\195?\160 jour de la base de donn?\195?\169es : pas de v?\195?\169rification au lancement (bad check) Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/UpdateDbAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/OpenDbAction.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/UpdateDbAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/UpdateDbAction.java 2013-09-25 14:49:08 UTC (rev 1225) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/UpdateDbAction.java 2013-09-25 16:36:22 UTC (rev 1226) @@ -49,8 +49,7 @@ public class UpdateDbAction extends AbstractMainUITuttiAction { /** Logger. */ - private static final Log log = - LogFactory.getLog(UpdateDbAction.class); + private static final Log log = LogFactory.getLog(UpdateDbAction.class); protected ApplicationInfo updateDbVersion; @@ -82,7 +81,7 @@ updateDbVersion = dbVersions.get(TuttiDbUpdaterCallBack.DB_UPDATE_NAME); - if (updateDbVersion != null) { + if (updateDbVersion != null && updateDbVersion.newVersion != null) { // ask user if it wants to do the update String htmlMessage = String.format( Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/OpenDbAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/OpenDbAction.java 2013-09-25 14:49:08 UTC (rev 1225) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/OpenDbAction.java 2013-09-25 16:36:22 UTC (rev 1226) @@ -110,7 +110,7 @@ updateDbVersion = dbVersions.get(TuttiDbUpdaterCallBack.DB_UPDATE_NAME); - if (updateDbVersion != null) { + if (updateDbVersion != null && updateDbVersion.newVersion != null) { // ask user if it wants to do the update String htmlMessage = String.format(