This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository topia. See http://git.nuiton.org/topia.git commit f2d8d573bb017a69ec4890011d44a1d4256799be Author: Arnaud Thimel <thimel@codelutin.com> Date: Wed Apr 8 22:34:26 2015 +0200 refs #2892 Fix setTopiaIdFactory(...) only if necessary --- .../org/nuiton/topia/persistence/TopiaConfigurationBuilder.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaConfigurationBuilder.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaConfigurationBuilder.java index a566461..938312d 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaConfigurationBuilder.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaConfigurationBuilder.java @@ -2,6 +2,7 @@ package org.nuiton.topia.persistence; import com.google.common.base.MoreObjects; import com.google.common.base.Preconditions; +import com.google.common.base.Strings; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import org.apache.commons.io.IOUtils; @@ -132,10 +133,10 @@ public class TopiaConfigurationBuilder { result.setInitSchema(initSchema); // others - String topiaIdFactoryClassName = MoreObjects.firstNonNull( - configuration.get(CONFIG_PERSISTENCE_TOPIA_ID_FACTORY_CLASS_NAME), - FullyQualifiedNamePlusUuidTopiaIdFactory.class.getName()); - result.setTopiaIdFactoryClassName(topiaIdFactoryClassName); + String topiaIdFactoryClassName = configuration.get(CONFIG_PERSISTENCE_TOPIA_ID_FACTORY_CLASS_NAME); + if (!Strings.isNullOrEmpty(topiaIdFactoryClassName)) { + result.setTopiaIdFactoryClassName(topiaIdFactoryClassName); + } result.setSchemaName(configuration.get(CONFIG_DEFAULT_SCHEMA)); // Hibernate -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.