This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 598e7c5ab19f0a1e85fde6824ab81f39d2a55cf7 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 31 00:27:24 2015 +0200 Utilisation aussi du label dans le calcul de l'égalité sur une configuration de source de type topia PG (on s'en sert pour différencier différentes configuration sur la même base) --- .../configuration/ObserveDataSourceConfigurationTopiaPG.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/observe-services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationTopiaPG.java b/observe-services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationTopiaPG.java index 4aa7fc1..62fd97c 100644 --- a/observe-services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationTopiaPG.java +++ b/observe-services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationTopiaPG.java @@ -60,19 +60,21 @@ public class ObserveDataSourceConfigurationTopiaPG extends ObserveDataSourceConf if (this == o) return true; if (!(o instanceof ObserveDataSourceConfigurationTopiaPG)) return false; ObserveDataSourceConfigurationTopiaPG that = (ObserveDataSourceConfigurationTopiaPG) o; - return Objects.equals(jdbcUrl, that.jdbcUrl) && + return Objects.equals(label, that.label) && + Objects.equals(jdbcUrl, that.jdbcUrl) && Objects.equals(username, that.username) && Objects.equals(password, that.password); } @Override public int hashCode() { - return Objects.hash(jdbcUrl, username, password); + return Objects.hash(label, jdbcUrl, username, password); } @Override public String toString() { return MoreObjects.toStringHelper(this) + .add("label", label) .add("jdbcUrl", jdbcUrl) .add("username", username) .add("password", "***") -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.