Author: tchemit Date: 2013-07-11 18:43:58 +0200 (Thu, 11 Jul 2013) New Revision: 2752 Url: http://nuiton.org/projects/topia/repository/revisions/2752 Log: refs #2083: Refactor topiaId generation (reproduce previous behaviour) Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java 2013-07-11 16:27:47 UTC (rev 2751) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java 2013-07-11 16:43:58 UTC (rev 2752) @@ -389,9 +389,12 @@ "Can't put properties on new Object", eee); } - String newTopiaId = getContext().getTopiaIdFactory().newTopiaId(entityClass, result); - result.setTopiaId(newTopiaId); - + if (result.getTopiaId() == null) { + // tchemit 2013/07/11 : avant ce code était avant le block précédent, donc si on avait un topiaId on n'en regénérait pas un + // tchemit 2013/07/11 : donc je remet le même comportement qu'avant + String newTopiaId = getContext().getTopiaIdFactory().newTopiaId(entityClass, result); + result.setTopiaId(newTopiaId); + } if (result instanceof TopiaEntityContextable) { TopiaEntityContextable contextable = (TopiaEntityContextable)result; contextable.setTopiaContext(getContext());