This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository wao. See http://git.codelutin.com/wao.git commit 159153cd5a22762d30dce0564dc828478230ec63 Author: Brendan Le Ny <bleny@codelutin.com> Date: Thu Dec 4 15:24:09 2014 +0100 Correction d'un bogue suscité par l'utilisation de instanceof sur des entités Hibernate --- .../java/fr/ifremer/wao/entity/CompanyImpl.java | 5 +++++ .../java/fr/ifremer/wao/entity/WaoUserImpl.java | 10 +--------- wao-persistence/src/main/xmi/wao-model.zargo | Bin 61324 -> 61366 bytes 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/wao-persistence/src/main/java/fr/ifremer/wao/entity/CompanyImpl.java b/wao-persistence/src/main/java/fr/ifremer/wao/entity/CompanyImpl.java index 10fa93e..8b79317 100644 --- a/wao-persistence/src/main/java/fr/ifremer/wao/entity/CompanyImpl.java +++ b/wao-persistence/src/main/java/fr/ifremer/wao/entity/CompanyImpl.java @@ -41,6 +41,11 @@ public class CompanyImpl extends CompanyAbstract { } @Override + public Company getCompany() { + return this; + } + + @Override public String toString() { return "CompanyImpl{name=" + getName() + "}"; } diff --git a/wao-persistence/src/main/java/fr/ifremer/wao/entity/WaoUserImpl.java b/wao-persistence/src/main/java/fr/ifremer/wao/entity/WaoUserImpl.java index 62b4fad..7ad38c9 100644 --- a/wao-persistence/src/main/java/fr/ifremer/wao/entity/WaoUserImpl.java +++ b/wao-persistence/src/main/java/fr/ifremer/wao/entity/WaoUserImpl.java @@ -95,15 +95,7 @@ public class WaoUserImpl extends WaoUserAbstract { @Override public Company getCompany() { - Organisation organisation = getOrganisation(); - Company company; - if (organisation instanceof Laboratory) { - company = ((Laboratory) organisation).getCompany(); - } else if (organisation instanceof Company) { - company = (Company) organisation; - } else { - throw new IllegalStateException(organisation.toString()); - } + Company company = getOrganisation().getCompany(); return company; } diff --git a/wao-persistence/src/main/xmi/wao-model.zargo b/wao-persistence/src/main/xmi/wao-model.zargo index c9ea2f3..5f27d3a 100644 Binary files a/wao-persistence/src/main/xmi/wao-model.zargo and b/wao-persistence/src/main/xmi/wao-model.zargo differ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.