From ed54ee293214048831abb025a461d780dc63872b Mon Sep 17 00:00:00 2001
From: Dominique Marcadet <Dominique.Marcadet@centralesupelec.fr>
Date: Wed, 29 May 2019 09:38:39 +0200
Subject: [PATCH] hash and equals use only required attributes in
NsIdentification
---
.../riseclipse/iec61850/nsd/util/NsIdentification.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/util/NsIdentification.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/util/NsIdentification.java
index 651ad96..5419d5f 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/util/NsIdentification.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/util/NsIdentification.java
@@ -47,7 +47,8 @@ public class NsIdentification {
@Override
public int hashCode() {
- return Objects.hash( id, release, revision, version );
+ // Only id and version are required, revision and release are optional
+ return Objects.hash( id, version );
}
@Override
@@ -56,8 +57,7 @@ public class NsIdentification {
if( obj == null ) return false;
if( getClass() != obj.getClass() ) return false;
NsIdentification other = ( NsIdentification ) obj;
- return Objects.equals( id, other.id ) && Objects.equals( release, other.release )
- && Objects.equals( revision, other.revision ) && Objects.equals( version, other.version );
+ return Objects.equals( id, other.id ) && Objects.equals( version, other.version );
}
@Override
@@ -68,4 +68,5 @@ public class NsIdentification {
+ ( release != null ? "release=" + release : "" ) + "]";
}
-}
\ No newline at end of file
+}
+
--
GitLab